#787 Updates for network changes to built images
Merged 3 years ago by kevin. Opened 3 years ago by pbrobinson.
pbrobinson/fedora-kickstarts net-fixes  into  main

file modified
+1 -1
@@ -79,7 +79,7 @@ 

  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

  

file modified
+1 -8
@@ -162,18 +162,11 @@ 

  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"

file modified
+1 -2
@@ -87,8 +87,7 @@ 

  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

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 pbrobinson@fedoraproject.org

Pull-Request has been merged by kevin

3 years ago