From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 16 Aug 2017 11:47:35 +0000 (+0200)
Subject: And set net.ifnames to 0
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a640453031f7f590851d8e0f27fb3de39be2801a;p=mirror%2Fdsa-puppet.git

And set net.ifnames to 0
---

diff --git a/modules/grub/files/etc-default-grub b/modules/grub/files/etc-default-grub
new file mode 100644
index 000000000..b3a34671a
--- /dev/null
+++ b/modules/grub/files/etc-default-grub
@@ -0,0 +1,32 @@
+# If you change this file, run 'update-grub' afterwards to update
+# /boot/grub/grub.cfg.
+# For full documentation of the options in this file, see:
+#   info -f grub -n 'Simple configuration'
+
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=5
+GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
+GRUB_CMDLINE_LINUX_DEFAULT="quiet"
+GRUB_CMDLINE_LINUX=""
+
+# Uncomment to enable BadRAM filtering, modify to suit your needs
+# This works with Linux (no patch required) and with any kernel that obtains
+# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)
+#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef"
+
+# Uncomment to disable graphical terminal (grub-pc only)
+#GRUB_TERMINAL=console
+
+# The resolution used on graphical terminal
+# note that you can use only modes which your graphic card supports via VBE
+# you can see them in real GRUB with the command `vbeinfo'
+#GRUB_GFXMODE=640x480
+
+# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
+#GRUB_DISABLE_LINUX_UUID=true
+
+# Uncomment to disable generation of recovery mode menu entries
+#GRUB_DISABLE_RECOVERY="true"
+
+# Uncomment to get a beep at grub start
+#GRUB_INIT_TUNE="480 440 1"
diff --git a/modules/grub/manifests/init.pp b/modules/grub/manifests/init.pp
index eab53d414..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':
-			content  => template('grub/etc-default-grub.erb'),
+			# 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']
 		}
 
diff --git a/modules/grub/templates/etc-default-grub.erb b/modules/grub/templates/etc-default-grub.erb
deleted file mode 100644
index f12b89d30..000000000
--- a/modules/grub/templates/etc-default-grub.erb
+++ /dev/null
@@ -1,38 +0,0 @@
-# If you change this file, run 'update-grub' afterwards to update
-# /boot/grub/grub.cfg.
-# For full documentation of the options in this file, see:
-#   info -f grub -n 'Simple configuration'
-
-GRUB_DEFAULT=0
-GRUB_TIMEOUT=5
-GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
-GRUB_CMDLINE_LINUX_DEFAULT="quiet"
-<%- if scope.lookupvar('::debarchitecture') == "arm64" -%>
-GRUB_CMDLINE_LINUX="console=ttyAMA0,115200n8"
-<% else -%>
-GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"
-<%- end -%>
-
-# Uncomment to enable BadRAM filtering, modify to suit your needs
-# This works with Linux (no patch required) and with any kernel that obtains
-# the memory map information from GRUB (GNU Mach, kernel of FreeBSD ...)
-#GRUB_BADRAM="0x01234567,0xfefefefe,0x89abcdef,0xefefefef"
-
-# Uncomment to disable graphical terminal (grub-pc only)
-#GRUB_TERMINAL=console
-
-# The resolution used on graphical terminal
-# note that you can use only modes which your graphic card supports via VBE
-# you can see them in real GRUB with the command `vbeinfo'
-#GRUB_GFXMODE=640x480
-
-# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
-#GRUB_DISABLE_LINUX_UUID=true
-
-# Uncomment to disable generation of recovery mode menu entries
-#GRUB_DISABLE_RECOVERY="true"
-
-# Uncomment to get a beep at grub start
-#GRUB_INIT_TUNE="480 440 1"
-GRUB_TERMINAL="serial console"
-GRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"
diff --git a/modules/grub/templates/puppet-grub-serial.cfg.erb b/modules/grub/templates/puppet-grub-serial.cfg.erb
new file mode 100644
index 000000000..42597a9d7
--- /dev/null
+++ b/modules/grub/templates/puppet-grub-serial.cfg.erb
@@ -0,0 +1,8 @@
+<%- if scope.lookupvar('::debarchitecture') == "arm64" -%>
+GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=ttyAMA0,115200n8"
+<% else -%>
+GRUB_CMDLINE_LINUX="$GRUB_CMDLINE_LINUX console=tty0 console=ttyS0,115200n8"
+<%- end -%>
+
+GRUB_TERMINAL="serial console"
+GRUB_SERIAL_COMMAND="serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"