From f15dd026fe1b61a7b1f153ef00e014ddeab3f2eb Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 24 May 2017 01:41:20 -0400 Subject: [PATCH] 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] https://github.com/rhinstaller/anaconda/blob/ee91db6fa3972668b05808b3c7de125a7edd581f/pyanaconda/payload/__init__.py#L722-L726 (cherry picked from commit 68804358d892a15ec62ee55bd7af7e21bdf78028) --- fedora-atomic.ks | 3 --- fedora-cloud-base.ks | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/fedora-atomic.ks b/fedora-atomic.ks index cb20663..4318f4b 100644 --- a/fedora-atomic.ks +++ b/fedora-atomic.ks @@ -140,7 +140,4 @@ echo "Adding Developer Mode GRUB2 menu item." # https://bugs.launchpad.net/cloud-init/+bug/1670052 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 diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks index 45ecc4d..6d4f8c4 100644 --- a/fedora-cloud-base.ks +++ b/fedora-cloud-base.ks @@ -81,6 +81,9 @@ which #-kbd -uboot-tools -kernel +# No need for plymouth. Also means anaconda won't put rhgb/quiet +# on kernel command line +-plymouth %end @@ -259,8 +262,5 @@ touch /etc/machine-id # https://bugs.launchpad.net/cloud-init/+bug/1670052 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