srbala/fedora-kickstarts
1
1
Fork 1
mirror of https://pagure.io/fedora-kickstarts.git synced 2025-10-31 07:15:59 +00:00
Code Issues Releases Activity

cloud: clean up networking configuration

Browse Source 
We're no longer using legacy network scripts to bring up networking.
We're using NetworkManager and now in F33+ networkmanager will even
default to writing out new configuration as NM keyfiles in
/etc/NetworkManager/system-connections/. We don't need to lay down
a networking config for eth0. Either cloud-init will do that for us
or NetworkManager will default to DHCP anyway.

We also don't need to populate /etc/hosts as that will get done on
boot too with the same content we were writing there already.

(cherry picked from commit 54d53e8439)
This commit is contained in:
Dusty Mabe 2020-09-02 17:02:18 -04:00
parent 3adfb2feec
commit 11732dafb1
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671
1 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
fedora-cloud-base.ks
View File

@ -34,7 +34,6 @@ firewall --disabled
# We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images. # We pass net.ifnames=0 because we always want to use eth0 here on all the cloud images.
bootloader --timeout=1 --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8" bootloader --timeout=1 --append="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
network --bootproto=dhcp --device=link --activate --onboot=on
services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
zerombr zerombr
@ -116,32 +115,6 @@ echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-
echo -n "Network fixes"
# initscripts don't like this file to be missing.
# and https://bugzilla.redhat.com/show_bug.cgi?id=1204612
cat > /etc/sysconfig/network << EOF
NETWORKING=yes
NOZEROCONF=yes
DEVTIMEOUT=10
EOF
# simple eth0 config, again not hard-coded to the build hardware
cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
DEVICE="eth0"
BOOTPROTO="dhcp"
ONBOOT="yes"
TYPE="Ethernet"
PERSISTENT_DHCLIENT="yes"
EOF
# generic localhost names
cat > /etc/hosts << EOF
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
EOF
echo .
echo "Removing random-seed so it's not the same in every image." echo "Removing random-seed so it's not the same in every image."
rm -f /var/lib/systemd/random-seed rm -f /var/lib/systemd/random-seed
@ -157,12 +130,10 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
rm -f /var/tmp/zeros rm -f /var/tmp/zeros
echo "(Don't worry -- that out-of-space error was expected.)" echo "(Don't worry -- that out-of-space error was expected.)"
# When we build the image with oz, dracut is used # When we build the image a networking config file gets left behind.
# and sets up a ifcfg-en<whatever> for the device. We don't # Let's clean it up.
# want to use this, we use eth0 so it is always the same. echo "Cleanup leftover networking configuration"
# So we remove all these ifcfg-en<whatever> devices so rm -f /etc/NetworkManager/system-connections/*.nmconnection
# The 'network' service can come up cleanly.
rm -f /etc/sysconfig/network-scripts/ifcfg-en*
# Remove machine-id on pre generated images # Remove machine-id on pre generated images
rm -f /etc/machine-id rm -f /etc/machine-id