Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=39908e0f83fdc8c99096f06aebf3099d14161b60
commit 39908e0f83fdc8c99096f06aebf3099d14161b60 Author: crazy <[email protected]> Date: Wed Jan 13 03:37:49 2016 +0100 grub2-2.00-20-x86_64 * always show 'full' systemd messages on boot ' see the comment in /etc/default/grub * fix duplicated audit=0 since we included that in : GRUB_CMDLINE_LINUX= and GRUB_CMDLINE_LINUX_DEFAULT= * minor corections in install file diff --git a/source/base/grub2/FrugalBuild b/source/base/grub2/FrugalBuild index 107d965..3a270e6 100644 --- a/source/base/grub2/FrugalBuild +++ b/source/base/grub2/FrugalBuild @@ -4,7 +4,7 @@ pkgname=grub2 _F_archive_name=grub pkgver=2.00 -pkgrel=19 +pkgrel=20 pkgdesc="The GNU GRand Unified Bootloader" url="http://www.gnu.org/software/grub/"; rodepends=('grub-theme-frugalware' 'scriptlet-core') diff --git a/source/base/grub2/grub b/source/base/grub2/grub index 2a6560c..15a5221 100644 --- a/source/base/grub2/grub +++ b/source/base/grub2/grub @@ -7,8 +7,13 @@ GRUB_DISTRIBUTOR="Frugalware" GRUB_TERMINAL_INPUT=console GRUB_TERMINAL_OUTPUT=gfxterm #GRUB_SERIAL_COMMAND=serial -GRUB_CMDLINE_LINUX="audit=0" -GRUB_CMDLINE_LINUX_DEFAULT="quiet audit=0" +# Please do NOT duplicate the options +#GRUB_CMDLINE_LINUX="" +# we want systemd to *always* show the status messages on tty +# so we have to set .show_status to 1 because systemd now +# respects 'quit' kernel cmd and status is set to =auto , +# meaning only on error(s) messages popt up on console/tty -- crazy -- +GRUB_CMDLINE_LINUX_DEFAULT="quiet audit=0 systemd.show_status=1" #GRUB_DISABLE_LINUX_UUID=true GRUB_DISABLE_RECOVERY=true GRUB_GFXMODE=auto diff --git a/source/base/grub2/grub2.install b/source/base/grub2/grub2.install index 8b11d46..3d8b621 100644 --- a/source/base/grub2/grub2.install +++ b/source/base/grub2/grub2.install @@ -12,10 +12,13 @@ post_upgrade() { if ! grep -q audit /etc/default/grub ; then echo "Updating kernel cmdline to include audit=0" - sed -i 's/GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="audit=0 /' /etc/default/grub sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="/GRUB_CMDLINE_LINUX_DEFAULT="audit=0 /' /etc/default/grub /usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg fi + + ## empty GRUB_CMDLINE_LINUX=".." , yeah I know , however + + sed -i 's/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=""/g' /etc/default/grub if grep -q "audit=0 audit=0" /etc/default/grub ; then echo "Updating kernel cmdline to include audit=0 only once" @@ -23,6 +26,12 @@ post_upgrade() { /usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg fi + if ! grep -q "systemd.show_status=1" /etc/default/grub ; then + echo "Updating kernel cmdline to include systemd messages on tty1" + sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="/GRUB_CMDLINE_LINUX_DEFAULT="systemd.show_status=1 /' /etc/default/grub + /usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg + fi + } op=$1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
