From b8bebe32c2430600fa9fe02539a0648d110e764f Mon Sep 17 00:00:00 2001 From: Radek Vykydal Date: Wed, 9 Apr 2025 16:56:28 +0200 Subject: [PATCH 1/2] network: support inst.net.noautodefault option Related: RHEL-78272 --- data/systemd/Makefile.am | 1 + data/systemd/anaconda-generator | 1 + data/systemd/anaconda-nm-disable-autocons-rhel.service | 9 +++++++++ data/systemd/anaconda-nm-disable-autocons.service | 3 +-- 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 data/systemd/anaconda-nm-disable-autocons-rhel.service diff --git a/data/systemd/Makefile.am b/data/systemd/Makefile.am index 9cc4f4f8ac9..83928ecd447 100644 --- a/data/systemd/Makefile.am +++ b/data/systemd/Makefile.am @@ -28,6 +28,7 @@ dist_systemd_DATA = anaconda.service \ anaconda-sshd.service \ anaconda-nm-config.service \ anaconda-nm-disable-autocons.service \ + anaconda-nm-disable-autocons-rhel.service \ anaconda-import-initramfs-certs.service \ anaconda-pre.service \ anaconda-fips.service diff --git a/data/systemd/anaconda-generator b/data/systemd/anaconda-generator index 65dcfa0b9b8..02bf6b801d8 100755 --- a/data/systemd/anaconda-generator +++ b/data/systemd/anaconda-generator @@ -42,5 +42,6 @@ done ln -sf $systemd_dir/anaconda-nm-config.service $target_dir/anaconda-nm-config.service ln -sf $systemd_dir/anaconda-nm-disable-autocons.service $target_dir/anaconda-nm-disable-autocons.service +ln -sf $systemd_dir/anaconda-nm-disable-autocons-rhel.service $target_dir/anaconda-nm-disable-autocons-rhel.service ln -sf $systemd_dir/anaconda-pre.service $target_dir/anaconda-pre.service ln -sf "$systemd_dir/anaconda-import-initramfs-certs.service" "$target_dir/anaconda-import-initramfs-certs.service" diff --git a/data/systemd/anaconda-nm-disable-autocons-rhel.service b/data/systemd/anaconda-nm-disable-autocons-rhel.service new file mode 100644 index 00000000000..012512e8cd8 --- /dev/null +++ b/data/systemd/anaconda-nm-disable-autocons-rhel.service @@ -0,0 +1,9 @@ +[Unit] +ConditionKernelCommandLine=|ip +ConditionKernelCommandLine=|inst.ks +Description=NetworkManager autoconnections configuration for Anaconda installation environment for RHEL +Before=NetworkManager.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/anaconda-nm-disable-autocons diff --git a/data/systemd/anaconda-nm-disable-autocons.service b/data/systemd/anaconda-nm-disable-autocons.service index 4617936590e..7ba2bb05740 100644 --- a/data/systemd/anaconda-nm-disable-autocons.service +++ b/data/systemd/anaconda-nm-disable-autocons.service @@ -1,6 +1,5 @@ [Unit] -ConditionKernelCommandLine=|ip -ConditionKernelCommandLine=|inst.ks +ConditionKernelCommandLine=inst.net.noautodefault Description=NetworkManager autoconnections configuration for Anaconda installation environment Before=NetworkManager.service From 9cf36b73ab72a847625fb84fe3d33f94920257a3 Mon Sep 17 00:00:00 2001 From: Radek Vykydal Date: Wed, 9 Apr 2025 16:58:33 +0200 Subject: [PATCH 2/2] network: disable NM autoconnections also when BOOTIF is used Resolves: RHEL-78272 --- data/systemd/anaconda-nm-disable-autocons-rhel.service | 1 + 1 file changed, 1 insertion(+) diff --git a/data/systemd/anaconda-nm-disable-autocons-rhel.service b/data/systemd/anaconda-nm-disable-autocons-rhel.service index 012512e8cd8..317b7190f08 100644 --- a/data/systemd/anaconda-nm-disable-autocons-rhel.service +++ b/data/systemd/anaconda-nm-disable-autocons-rhel.service @@ -1,6 +1,7 @@ [Unit] ConditionKernelCommandLine=|ip ConditionKernelCommandLine=|inst.ks +CondidionKernelCommandLine=|BOOTIF Description=NetworkManager autoconnections configuration for Anaconda installation environment for RHEL Before=NetworkManager.service