X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgrub%2Fmanifests%2Finit.pp;h=989d44423f6c09409273c227e7192d340b2e1a23;hb=3b8f6afb92c2ca70911fe3dc67c9a23001ff99de;hp=7d9a1816f5a23e3aaf09d60d4cbc9b6c72e4f710;hpb=177542496d0839ae969ca2d91f1078fcccd62e1f;p=mirror%2Fdsa-puppet.git diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp index 7d9a1816f..989d44423 100644 --- a/modules/grub/manifests/init.pp +++ b/modules/grub/manifests/init.pp @@ -25,11 +25,12 @@ class grub { $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 { + # 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',