networking fixes for f25

* removes the extra ens3 ifcfg that seems to be added
by dracut at some point (cloud base did this in their
ks a year ago in c509863)
* adds net.ifnames=0 to the bootloader line, because
that seems to be necessary to actually disable consistent
device naming
* enables the network service

see https://pagure.io/atomic-wg/issue/174

(cherry picked from commit 5d987e82b3)
This commit is contained in:
Jason Brooks 2016-10-14 10:13:10 -07:00 committed by Dusty Mabe
parent b90d3b6e01
commit 38c2313eef
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671

View File

@ -18,7 +18,7 @@ user --name=none
firewall --disabled firewall --disabled
bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0"
network --bootproto=dhcp --device=link --activate --onboot=on 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
@ -124,12 +124,15 @@ 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.)"
# For trac ticket https://fedorahosted.org/cloud/ticket/128
rm -f /etc/sysconfig/network-scripts/ifcfg-ens3
echo "Adding Developer Mode GRUB2 menu item." echo "Adding Developer Mode GRUB2 menu item."
/usr/libexec/atomic-devmode/bootentry add /usr/libexec/atomic-devmode/bootentry add
# Disable network service here, as doing it in the services line # enable network service here, as doing it in the services line
# fails due to RHBZ #1369794 # fails due to RHBZ #1369794
/sbin/chkconfig network off /sbin/chkconfig network on
# 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