X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fgrub%2Fmanifests%2Finit.pp;h=1ef9ec783cfc68e2d9ba47d2a3c96a3528034512;hb=a640453031f7f590851d8e0f27fb3de39be2801a;hp=dab3d56a303221dbf792152036b37fcbab060478;hpb=ce0ae3688f7776f32216583d9cacd6ca6152119e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index dab3d56a3..1ef9ec783 100644
--- a/modules/grub/manifests/init.pp
+++ b/modules/grub/manifests/init.pp
@@ -1,7 +1,19 @@
 class grub {
 	if ($::kernel == 'Linux' and $::is_virtual and $::virtual == 'kvm') {
 		file { '/etc/default/grub':
-			source  => 'puppet:///modules/grub/etc-default-grub',
+			# restore to default
+			source => 'puppet:///modules/grub/etc-default-grub',
+			notify  => Exec['update-grub']
+		}
+		file { '/etc/default/grub.d':
+			ensure => directory
+		}
+		file { '/etc/default/grub.d/puppet-grub-serial.cfg':
+			content  => template('grub/puppet-grub-serial.cfg.erb'),
+			notify  => Exec['update-grub']
+		}
+		file { '/etc/default/grub.d/puppet-net-ifnames.cfg':
+			content  => template('grub/puppet-net-ifnames.cfg.erb'),
 			notify  => Exec['update-grub']
 		}