atomic, cloud: remove rhgb by removing plymouth

a59dfe5 caused us a few problems:
  - sed was breaking the symlink on atomic systems
  - /boot/grub2/grub.cfg is not the right file on a UEFI system
  - etc..

We'll solve this problem a different way by just not installing
plymouth in our systems, which is another way [1] to make sure
rhgb/quiet don't appear on your kernel command line.

[1] ee91db6fa3/pyanaconda/payload/__init__.py (L722-L726)

(cherry picked from commit 68804358d8)
This commit is contained in:
Dusty Mabe 2017-05-24 01:41:20 -04:00
parent e7742ffc33
commit f15dd026fe
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671
2 changed files with 3 additions and 6 deletions

View File

@ -140,7 +140,4 @@ echo "Adding Developer Mode GRUB2 menu item."
# https://bugs.launchpad.net/cloud-init/+bug/1670052 # https://bugs.launchpad.net/cloud-init/+bug/1670052
truncate -s 0 /etc/resolv.conf truncate -s 0 /etc/resolv.conf
# Disable rhgb/quiet: https://bugzilla.redhat.com/show_bug.cgi?id=510523
sed -i 's/rhgb quiet//' /boot/grub2/grub.cfg
%end %end

View File

@ -81,6 +81,9 @@ which
#-kbd #-kbd
-uboot-tools -uboot-tools
-kernel -kernel
# No need for plymouth. Also means anaconda won't put rhgb/quiet
# on kernel command line
-plymouth
%end %end
@ -259,8 +262,5 @@ touch /etc/machine-id
# https://bugs.launchpad.net/cloud-init/+bug/1670052 # https://bugs.launchpad.net/cloud-init/+bug/1670052
truncate -s 0 /etc/resolv.conf truncate -s 0 /etc/resolv.conf
# Disable rhgb/quiet: https://bugzilla.redhat.com/show_bug.cgi?id=510523
sed -i 's/rhgb quiet//' /boot/grub2/grub.cfg
%end %end