From c3841ff35a252ea7f5be6efe752bcd36510fb691 Mon Sep 17 00:00:00 2001 From: Joe Doss Date: Thu, 12 Jul 2018 15:33:14 -0500 Subject: [PATCH] Revert "Remove -NetworkManager to fix BZ#1596062" This reverts commit d95b59ac3beca4a95cef40306e4e598fe1eaaaaf. --- fedora-cloud-base.ks | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks index 740c742..b7584cb 100644 --- a/fedora-cloud-base.ks +++ b/fedora-cloud-base.ks @@ -15,9 +15,9 @@ # For a TDL file, I store one here: # https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl # (Koji generates one internally...what we really want is Koji to publish it statically) -# +# # Once you have imagefactory and imagefactory-plugins installed, run: -# +# # curl -O https://pagure.io/fedora-atomic/raw/master/f/fedora-atomic-rawhide.tdl # tempfile=$(mktemp --suffix=.ks) # ksflatten -v F22 -c fedora-cloud-base.ks > ${tempfile} @@ -75,6 +75,7 @@ which # Need to also add back plymouth in order to mask failure of # systemd-vconsole-setup.service. BZ#1272684. Comment out for now #-plymouth +-NetworkManager -iprutils # Now that BZ#1199868 is fixed kbd really gets removed but it breaks # systemd-vconsole-setup.service on boot. Comment out for now @@ -240,10 +241,10 @@ dd bs=1M if=/dev/zero of=/var/tmp/zeros || : rm -f /var/tmp/zeros echo "(Don't worry -- that out-of-space error was expected.)" -# When we build the image with oz, dracut is used -# and sets up a ifcfg-en for the device. We don't -# want to use this, we use eth0 so it is always the same. -# So we remove all these ifcfg-en devices so +# When we build the image with oz, dracut is used +# and sets up a ifcfg-en for the device. We don't +# want to use this, we use eth0 so it is always the same. +# So we remove all these ifcfg-en devices so # The 'network' service can come up cleanly. rm -f /etc/sysconfig/network-scripts/ifcfg-en*