From a640453031f7f590851d8e0f27fb3de39be2801a Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 16 Aug 2017 13:47:35 +0200
Subject: [PATCH] And set net.ifnames to 0

---
 .../etc-default-grub}                              |  8 +-------
 modules/grub/manifests/init.pp                     | 14 +++++++++++++-
 modules/grub/templates/puppet-grub-serial.cfg.erb  |  8 ++++++++
 3 files changed, 22 insertions(+), 8 deletions(-)
 rename modules/grub/{templates/etc-default-grub.erb => files/etc-default-grub} (79%)
 create mode 100644 modules/grub/templates/puppet-grub-serial.cfg.erb

diff --git a/modules/grub/templates/etc-default-grub.erb b/modules/grub/files/etc-default-grub
similarity index 79%
rename from modules/grub/templates/etc-default-grub.erb
rename to modules/grub/files/etc-default-grub
index f12b89d30..b3a34671a 100644
--- a/modules/grub/templates/etc-default-grub.erb
+++ b/modules/grub/files/etc-default-grub
@@ -7,11 +7,7 @@ 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 -%>
+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
@@ -34,5 +30,3 @@ GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"
 
 # 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/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/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"
-- 
2.20.1