From d331ba0290cf3c6f8c54201876417d9fd7f3cf4b Mon Sep 17 00:00:00 2001 From: Martin Kolman Date: Thu, 20 Jun 2024 18:03:12 +0200 Subject: [PATCH] Handle inst.rdp in Dracut 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 --- data/systemd/anaconda-direct.service | 2 +- pyanaconda/argument_parsing.py | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/data/systemd/anaconda-direct.service b/data/systemd/anaconda-direct.service index 2f09e05975f..e05c4408c43 100644 --- a/data/systemd/anaconda-direct.service +++ b/data/systemd/anaconda-direct.service @@ -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 diff --git a/pyanaconda/argument_parsing.py b/pyanaconda/argument_parsing.py index 846911d7df1..a1a1df87e27 100644 --- a/pyanaconda/argument_parsing.py +++ b/pyanaconda/argument_parsing.py @@ -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",