IoT: don't disable descriptive network names

Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
This commit is contained in:
Peter Robinson 2021-01-08 09:47:43 +00:00
parent ceb046a0ca
commit bf1e2b7b55

View File

@ -8,7 +8,7 @@ timezone --utc Etc/UTC
selinux --enforcing selinux --enforcing
rootpw --lock --iscrypted locked rootpw --lock --iscrypted locked
bootloader --timeout=1 --append="net.ifnames=0 modprobe.blacklist=vc4" bootloader --timeout=1 --append="modprobe.blacklist=vc4"
network --bootproto=dhcp --device=link --activate --onboot=on network --bootproto=dhcp --device=link --activate --onboot=on
services --enabled=NetworkManager,sshd,rngd services --enabled=NetworkManager,sshd,rngd
@ -70,14 +70,6 @@ cp /etc/skel/.bash* /var/roothome
# Remove any persistent NIC rules generated by udev # Remove any persistent NIC rules generated by udev
rm -vf /etc/udev/rules.d/*persistent-net*.rules rm -vf /etc/udev/rules.d/*persistent-net*.rules
# And ensure that we will do DHCP on eth0 on startup
cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
DEVICE="eth0"
BOOTPROTO="dhcp"
ONBOOT="yes"
TYPE="Ethernet"
PERSISTENT_DHCLIENT="yes"
EOF
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
@ -96,7 +88,7 @@ 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.)"
# For trac ticket https://pagure.io/atomic-wg/issue/128 # For trac ticket https://pagure.io/atomic-wg/issue/128
rm -f /etc/sysconfig/network-scripts/ifcfg-ens3 rm -f /etc/sysconfig/network-scripts/ifcfg-*
# Anaconda is writing an /etc/resolv.conf from the install environment. # Anaconda is writing an /etc/resolv.conf from the install environment.
# The system should start out with an empty file, otherwise cloud-init # The system should start out with an empty file, otherwise cloud-init