From 4ba7ce0148ddc835a93f905658a6da5f0288fe3b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 21 Mar 2021 19:14:59 +0000 Subject: [PATCH] Updates for network changes to built images NetworkManager has changed the defaults for where the config files are retained and by default we don't ship the traditional Sys-V network scripts so we can clean-up those bits. Signed-off-by: Peter Robinson --- fedora-disk-base.ks | 2 +- fedora-eln-guest.ks | 9 +-------- fedora-iot.ks | 3 +-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/fedora-disk-base.ks b/fedora-disk-base.ks index df003c5..01b71f0 100644 --- a/fedora-disk-base.ks +++ b/fedora-disk-base.ks @@ -79,7 +79,7 @@ rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn rm -f /var/lib/systemd/random-seed # The enp1s0 interface is a left over from the imagefactory install, clean this up -rm -f /etc/sysconfig/network-scripts/ifcfg-enp1s0 +rm -f /etc/NetworkManager/system-connections/*.nmconnection dnf -y remove dracut-config-generic diff --git a/fedora-eln-guest.ks b/fedora-eln-guest.ks index 137f325..7beefea 100644 --- a/fedora-eln-guest.ks +++ b/fedora-eln-guest.ks @@ -162,18 +162,11 @@ echo -n "Getty fixes" sed -i '/^#NAutoVTs=.*/ a\ NAutoVTs=0' /etc/systemd/logind.conf -echo -n "Network fixes" -# initscripts don't like this file to be missing. -cat > /etc/sysconfig/network << EOF -NETWORKING=yes -NOZEROCONF=yes -EOF - # For cloud images, 'eth0' _is_ the predictable device name, since # we don't want to be tied to specific virtual (!) hardware rm -f /etc/udev/rules.d/70* ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules -rm -f /etc/sysconfig/network-scripts/ifcfg-* +rm -f /etc/NetworkManager/system-connections/*.nmconnection # simple eth0 config, again not hard-coded to the build hardware cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF DEVICE="eth0" diff --git a/fedora-iot.ks b/fedora-iot.ks index 056f88d..21199fa 100644 --- a/fedora-iot.ks +++ b/fedora-iot.ks @@ -87,8 +87,7 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || : rm -f /var/tmp/zeros echo "(Don't worry -- that out-of-space error was expected.)" -# For trac ticket https://pagure.io/atomic-wg/issue/128 -rm -f /etc/sysconfig/network-scripts/ifcfg-* +rm -f /etc/NetworkManager/system-connections/*.nmconnection # Anaconda is writing an /etc/resolv.conf from the install environment. # The system should start out with an empty file, otherwise cloud-init