atomic: update link and revert some of the cherry-pick

Update the trac link to point to the pagure issue. Also
we don't actually want to enable legacy network service.
This was also reverted for f25 in 6f3661e.

(cherry picked from commit c49c95145d)
This commit is contained in:
Dusty Mabe 2017-04-19 15:55:51 -04:00
parent 0c7d01ca5e
commit fa047a1949
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671

View File

@ -127,15 +127,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 # 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-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
# enable network service here, as doing it in the services line # Disable network service here, as doing it in the services line
# fails due to RHBZ #1369794 # fails due to RHBZ #1369794
/sbin/chkconfig network on /sbin/chkconfig network off
# 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