Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=7eabb164eeb02f2f0de9b4e9297439e3f93aa81a

commit 7eabb164eeb02f2f0de9b4e9297439e3f93aa81a
Author: DeX77 <[email protected]>
Date:   Sun Nov 22 22:13:35 2015 +0100

grub2-2.00-18-x86_64

* relbump
* fix double audit=0 in kernel cmdline

diff --git a/source/base/grub2/FrugalBuild b/source/base/grub2/FrugalBuild
index 2f107a8..2e41076 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=17
+pkgrel=18
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/grub2.install b/source/base/grub2/grub2.install
index c6a4a6e..8b11d46 100644
--- a/source/base/grub2/grub2.install
+++ b/source/base/grub2/grub2.install
@@ -10,12 +10,19 @@ post_install()

post_upgrade() {

-       echo "Updating kernel cmdline to include audit=0"
-       if [ ! $(grep -q audit /etc/default/grub) ]; then
+       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
+
+        if grep -q "audit=0 audit=0" /etc/default/grub ; then
+               echo "Updating kernel cmdline to include audit=0 only once"
+               sed -i ':a; s/audit=0 audit=0/audit=0/g; ta' /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

Reply via email to