Skip to content

Commit

Permalink
Handle inst.rdp in Dracut
Browse files Browse the repository at this point in the history
Looks like we enable network already in dracut if inst.vnc is used,
lets switch the code to work with inst.rdp.

Also drop the VNC related commands, as they are no longer
expected to be used.

Resolves: RHEL-41219
  • Loading branch information
M4rtinK committed Jul 16, 2024
1 parent 467dddb commit d331ba0
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
2 changes: 1 addition & 1 deletion data/systemd/anaconda-direct.service
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ConditionPathIsDirectory=|/sys/hypervisor/s390
ConditionKernelCommandLine=|inst.notmux

[Service]
Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr GDK_BACKEND=x11 XDG_RUNTIME_DIR=/tmp LANG=en_US.UTF-8
Environment=HOME=/root MALLOC_CHECK_=2 MALLOC_PERTURB_=204 PATH=/usr/bin:/bin:/sbin:/usr GDK_BACKEND=wayland XDG_RUNTIME_DIR=/run/user/0 GIO_USE_VFS=local LANG=en_US.UTF-8
Type=oneshot
WorkingDirectory=/root
ExecStart=/usr/sbin/anaconda
Expand Down
9 changes: 0 additions & 9 deletions pyanaconda/argument_parsing.py
Original file line number Diff line number Diff line change
Expand Up @@ -498,15 +498,6 @@ def __call__(self, parser, namespace, values, option_string=None):
# Display
ap.add_argument("--resolution", dest="runres", default=None, metavar="WIDTHxHEIGHT",
help=help_parser.help_text("resolution"))
ap.add_argument("--usefbx", dest="xdriver", action="store_const", const="fbdev",
help=help_parser.help_text("usefbx"))
ap.add_argument("--vnc", action="store_true", default=False,
help=help_parser.help_text("vnc"))
ap.add_argument("--vncconnect", metavar="HOST:PORT", help=help_parser.help_text("vncconnect"))
ap.add_argument("--vncpassword", default="", metavar="PASSWORD",
help=help_parser.help_text("vncpassword"))
ap.add_argument("--xdriver", dest="xdriver", action="store", type=str,
default=None, metavar="DRIVER", help=help_parser.help_text("xdriver"))
ap.add_argument("--xtimeout", dest="xtimeout", action="store", type=int, default=X_TIMEOUT,
metavar="TIMEOUT_IN_SECONDS", help=help_parser.help_text("xtimeout"))
ap.add_argument("--rdp", action="store_true", default=False, dest="rdp_enabled",
Expand Down

0 comments on commit d331ba0

Please sign in to comment.