diff --git a/kickstarts/base.ks.erb b/kickstarts/base.ks.erb index 0f35c11..da69be7 100644 --- a/kickstarts/base.ks.erb +++ b/kickstarts/base.ks.erb @@ -127,24 +127,9 @@ passwd -e root # Remove root from the cockpit disallowed-users list sed -i s/root//g /etc/cockpit/disallowed-users -# During the image build, dracut sets up ifcfg-en for the device. -# On the appliances we expect eth0, so remove all the ifcfg-en device configurations -# and write a config for eth0 allowing the 'network' service to come up cleanly. -rm -f /etc/sysconfig/network-scripts/ifcfg-en* - # Remove machine-id cat /dev/null > /etc/machine-id -cat < /etc/sysconfig/network-scripts/ifcfg-eth0 -DEVICE=eth0 -BOOTPROTO=dhcp -ONBOOT=yes -TYPE=Ethernet -USERCTL=no -NM_CONTROLLED=no -DEFROUTE=yes -EOF - chvt 1 ) 2>&1 | tee /dev/tty3 %end diff --git a/kickstarts/partials/main/bootloader.ks.erb b/kickstarts/partials/main/bootloader.ks.erb index 35aac48..e45770b 100644 --- a/kickstarts/partials/main/bootloader.ks.erb +++ b/kickstarts/partials/main/bootloader.ks.erb @@ -1,9 +1,9 @@ <% if @target == "ec2" || @target == "openstack" %> -bootloader --location=mbr --driveorder=vda --append="crashkernel=auto rhgb quiet net.ifnames=0 biosdevname=0 console=tty0 console=ttyS0,115200n8" +bootloader --location=mbr --driveorder=vda --append="crashkernel=auto rhgb quiet console=tty0 console=ttyS0,115200n8" <% elsif @target == "azure" %> -bootloader --location=mbr --driveorder=vda --append="crashkernel=auto rhgb quiet net.ifnames=0 biosdevname=0 console=ttyS0 earlyprintk=ttyS0 rootdelay=300" +bootloader --location=mbr --driveorder=vda --append="crashkernel=auto rhgb quiet console=ttyS0 earlyprintk=ttyS0 rootdelay=300" <% elsif @target == "gce" %> -bootloader --location=mbr --driveorder=vda --append="crashkernel=auto rhgb quiet net.ifnames=0 biosdevname=0 console=ttyS0,38400n8" +bootloader --location=mbr --driveorder=vda --append="crashkernel=auto rhgb quiet console=ttyS0,38400n8" <% else %> -bootloader --location=mbr --driveorder=vda --append="crashkernel=auto rhgb quiet net.ifnames=0 biosdevname=0 console=ttyS0,115200 console=tty0" +bootloader --location=mbr --driveorder=vda --append="crashkernel=auto rhgb quiet console=ttyS0,115200 console=tty0" <% end %> diff --git a/kickstarts/partials/post/gce.ks.erb b/kickstarts/partials/post/gce.ks.erb index 5ac559c..d70ffd9 100644 --- a/kickstarts/partials/post/gce.ks.erb +++ b/kickstarts/partials/post/gce.ks.erb @@ -28,5 +28,3 @@ EOF # Lock root account usermod -L root - -echo "PERSISTENT_DHCLIENT=1" >> /etc/sysconfig/network-scripts/ifcfg-eth0