From 8b030ec9db165007af0254978c96f742dccc2235 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 12 May 2020 12:28:27 -0300
Subject: Fix: weird initramfs bug

---
 files/etc/initramfs-tools/hooks/fix-fixme | 17 +++++++++++++++++
 manifests/subsystem/initramfs.pp          | 14 +++++++++++++-
 manifests/subsystem/sysctl/appliance.pp   | 14 --------------
 manifests/subsystem/sysctl/panic.pp       | 14 ++++++++++++++
 4 files changed, 44 insertions(+), 15 deletions(-)
 create mode 100755 files/etc/initramfs-tools/hooks/fix-fixme
 delete mode 100644 manifests/subsystem/sysctl/appliance.pp
 create mode 100644 manifests/subsystem/sysctl/panic.pp

diff --git a/files/etc/initramfs-tools/hooks/fix-fixme b/files/etc/initramfs-tools/hooks/fix-fixme
new file mode 100755
index 0000000..fbdbd3c
--- /dev/null
+++ b/files/etc/initramfs-tools/hooks/fix-fixme
@@ -0,0 +1,17 @@
+#!/bin/sh
+PREREQ="cryptroot"
+prereqs()
+{
+	echo "$PREREQ"
+}
+
+case $1 in
+	prereqs)
+		prereqs
+		exit 0
+		;;
+esac
+
+. /usr/share/initramfs-tools/hook-functions
+# Begin real processing below this line
+sed -i -e "s|/FIXME-initramfs-rootmnt||g" $DESTDIR/cryptroot/crypttab
diff --git a/manifests/subsystem/initramfs.pp b/manifests/subsystem/initramfs.pp
index e3b5271..9cf04e1 100644
--- a/manifests/subsystem/initramfs.pp
+++ b/manifests/subsystem/initramfs.pp
@@ -28,12 +28,24 @@ class nodo::subsystem::initramfs(
     mode    => '0644',
   }
 
+  # Weird fix
+  # This is a bug that might be submited upstream to debian or initramfs-tools
+  file { "/etc/initramfs-tools/hooks/fix-fixme":
+    owner   => "root",
+    group   => "root",
+    mode    => '0755',
+    ensure  => present,
+    source  => "puppet:///modules/nodo/etc/initramfs-tools/hooks/fix-fixme",
+  }
+
   # Update initramfs when needed
   exec { "update-initramfs":
     command     => "update-initramfs -v -t -u",
     subscribe   => [ File["/etc/initramfs-tools/modules"],
                      File["/etc/modprobe.d/blacklist.conf"],
-                     File["/etc/initramfs-tools/conf.d/keymap.conf"] ],
+                     File["/etc/initramfs-tools/conf.d/keymap.conf"],
+                     File["/etc/initramfs-tools/hooks/fix-fixme"],
+                   ],
     refreshonly => true,
   }
 }
diff --git a/manifests/subsystem/sysctl/appliance.pp b/manifests/subsystem/sysctl/appliance.pp
deleted file mode 100644
index 2657542..0000000
--- a/manifests/subsystem/sysctl/appliance.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-class nodo::subsystem::sysctl::appliance($kernel_panic = lookup('nodo::sysctl::appliance', undef, undef, '20')) {
-  file { "/etc/sysctl.d/kernel.panic.conf":
-    owner   => "root",
-    group   => "root",
-    mode    => '0644',
-    ensure  => present,
-    content => "kernel.panic = ${kernel_panic}\n",
-  }
-
-  exec { "/bin/echo '${kernel_panic}' > /proc/sys/kernel/panic":
-    subscribe   => File["/etc/sysctl.d/kernel.panic.conf"],
-    refreshonly => true,
-  }
-}
diff --git a/manifests/subsystem/sysctl/panic.pp b/manifests/subsystem/sysctl/panic.pp
new file mode 100644
index 0000000..2657542
--- /dev/null
+++ b/manifests/subsystem/sysctl/panic.pp
@@ -0,0 +1,14 @@
+class nodo::subsystem::sysctl::appliance($kernel_panic = lookup('nodo::sysctl::appliance', undef, undef, '20')) {
+  file { "/etc/sysctl.d/kernel.panic.conf":
+    owner   => "root",
+    group   => "root",
+    mode    => '0644',
+    ensure  => present,
+    content => "kernel.panic = ${kernel_panic}\n",
+  }
+
+  exec { "/bin/echo '${kernel_panic}' > /proc/sys/kernel/panic":
+    subscribe   => File["/etc/sysctl.d/kernel.panic.conf"],
+    refreshonly => true,
+  }
+}
-- 
cgit v1.2.3