X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgrub%2Fmanifests%2Finit.pp;h=73ec4eca09a157bfc772a091f09a79e6a22b740b;hb=8a6f86ad8e7da1d84ef781cc4415ede0247fe7ec;hp=51f3f877bac247891fe82393185b12d8c08beaf4;hpb=0c990ed9c41fc8f011f15200cba00216ccd2ac77;p=mirror%2Fdsa-puppet.git

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index 51f3f877b..73ec4eca0 100644
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -25,7 +25,7 @@ class grub {
 		$grub_manage = false
 	}
 
-	if $grub_manage {
+	if ($::update_grub and $grub_manage) {
 		# hp-health requires nopat on linux 4.9
 		$grub_do_nopat = ($::systemproductname and $::systemproductname =~ /^ProLiant/ and versioncmp($::kernelversion, '4.9') >= 0)