From c7272c4a3eb8662dd55f1f302ef30c7b9220c69e Mon Sep 17 00:00:00 2001 From: Timo Makinen Date: Thu, 7 May 2015 15:39:04 +0300 Subject: [PATCH] grub: Fix kernel argument checking for Fedora 21. --- grub/manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grub/manifests/init.pp b/grub/manifests/init.pp index e13c0d5..bc7b97b 100644 --- a/grub/manifests/init.pp +++ b/grub/manifests/init.pp @@ -46,7 +46,7 @@ define grub::kernelparam($ensure = "present") { exec { "grubby --update-kernel=ALL --args=${name}": path => "/bin:/usr/bin:/sbin:/usr/sbin", unless => $::operatingsystem ? { - "fedora" => "egrep '^[[:space:]]*linux[[:space:]].* ${name}( .*)?' /boot/grub2/grub.cfg", + "fedora" => "egrep '^[[:space:]]*linux[0-9]*[[:space:]].* ${name}( .*)?' /boot/grub2/grub.cfg", default => "grubby --info=`grubby --default-kernel` | egrep '^args=\"(.* )?${name}( .*)?\"'", }, tag => "bootstrap", @@ -55,7 +55,7 @@ define grub::kernelparam($ensure = "present") { exec { "grubby --update-kernel=ALL --remove-args=${name}": path => "/bin:/usr/bin:/sbin:/usr/sbin", onlyif => $::operatingsystem ? { - "fedora" => "egrep '^[[:space:]]*linux[[:space:]].* ${name}( .*)?' /boot/grub2/grub.cfg", + "fedora" => "egrep '^[[:space:]]*linux[0-9]*[[:space:]].* ${name}( .*)?' /boot/grub2/grub.cfg", default => "grubby --info=`grubby --default-kernel` | egrep '^args=\"(.* )?${name}( .*)?\"'", }, tag => "bootstrap",