projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2a639d0
)
Don't set grub_do_nopat or grub_do_extra unless grub_manage is set
author
Julien Cristau
<jcristau@debian.org>
Tue, 12 Sep 2017 13:33:11 +0000
(15:33 +0200)
committer
Julien Cristau
<jcristau@debian.org>
Tue, 12 Sep 2017 13:33:11 +0000
(15:33 +0200)
modules/grub/manifests/init.pp
patch
|
blob
|
history
diff --git
a/modules/grub/manifests/init.pp
b/modules/grub/manifests/init.pp
index
7d9a181
..
989d444
100644
(file)
--- a/
modules/grub/manifests/init.pp
+++ b/
modules/grub/manifests/init.pp
@@
-25,11
+25,12
@@
class grub {
$grub_manage = false
}
$grub_manage = false
}
- # hp-health requires nopat on linux 4.9
- $grub_do_nopat = ($::systemproductname =~ /^ProLiant/ and versioncmp($::kernelversion, '4.9') >= 0)
- $grub_do_extra = $::hostname in [fasolo]
-
if $grub_manage {
if $grub_manage {
+ # hp-health requires nopat on linux 4.9
+ $grub_do_nopat = ($::systemproductname =~ /^ProLiant/ and versioncmp($::kernelversion, '4.9') >= 0)
+
+ $grub_do_extra = $::hostname in [fasolo]
+
file { '/etc/default/grub':
# restore to default
source => 'puppet:///modules/grub/etc-default-grub',
file { '/etc/default/grub':
# restore to default
source => 'puppet:///modules/grub/etc-default-grub',