tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

grub: Fix kernel argument checking for Fedora 21.

Browse source
This commit is contained in:
Timo Makinen 2015-05-07 15:39:04 +03:00
parent d22002f7f7
commit c7272c4a3e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
grub/manifests/init.pp
View file

@ -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",