switch to mkinitramfs-based method

9 files changed, 92 insertions, 20 deletions

diff --git a/.gitignore b/.gitignore
index d95bd06..f5e47d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ debian-live-8.4.0-amd64-gnome-desktop.iso
 boot
 var
 isolinux/live/initrd.img
+isolinux/live/vmlinuz
diff --git a/initramfs-tools/initramfs.conf b/initramfs-tools/initramfs.conf
new file mode 100644
index 0000000..93f88bc
--- /dev/null
+++ b/initramfs-tools/initramfs.conf
@@ -0,0 +1,62 @@
+#
+# initramfs.conf
+# Configuration file for mkinitramfs(8). See initramfs.conf(5).
+#
+# Note that configuration options from this file can be overridden
+# by config files in the /etc/initramfs-tools/conf.d directory.
+
+#
+# MODULES: [ most | netboot | dep | list ]
+#
+# most - Add most filesystem and all harddrive drivers.
+#
+# dep - Try and guess which modules to load.
+#
+# netboot - Add the base modules, network modules, but skip block devices.
+#
+# list - Only include modules from the 'additional modules' list
+#
+
+MODULES=most
+
+#
+# BUSYBOX: [ y | n ]
+#
+# Use busybox if available.
+#
+
+BUSYBOX=y
+
+#
+# KEYMAP: [ y | n ]
+#
+# Load a keymap during the initramfs stage.
+#
+
+KEYMAP=n
+
+#
+# COMPRESS: [ gzip | bzip2 | lzma | lzop | xz ]
+#
+
+COMPRESS=gzip
+
+#
+# NFS Section of the config.
+#
+
+#
+# DEVICE: ...
+#
+# Specify a specific network interface, like eth0
+# Overridden by optional ip= bootarg
+#
+
+DEVICE=
+
+#
+# NFSROOT: [ auto | HOST:MOUNT ]
+#
+
+NFSROOT=auto
+
diff --git a/initramfs-tools/modules b/initramfs-tools/modules
new file mode 100644
index 0000000..dd9dc54
--- /dev/null
+++ b/initramfs-tools/modules
@@ -0,0 +1,11 @@
+# List of modules that you want to include in your initramfs.
+# They will be loaded at boot time in the order below.
+#
+# Syntax:  module_name [args ...]
+#
+# You must run update-initramfs(8) to effect this change.
+#
+# Examples:
+#
+# raid1
+# sd_mod
diff --git a/initramfs-tools/scripts/local-bottom/samizdat b/initramfs-tools/scripts/local-bottom/samizdat
new file mode 100755
index 0000000..376353d
--- /dev/null
+++ b/initramfs-tools/scripts/local-bottom/samizdat
@@ -0,0 +1,9 @@
+#!/bin/sh
+if [ "$1" = prereqs ]; then
+    echo
+    exit
+fi
+
+echo 'Hello, world!'
+read line
+echo BOOT=samizdat >> /conf/param.conf
diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
new file mode 100644
index 0000000..e41c65e
--- /dev/null
+++ b/initramfs-tools/scripts/samizdat
@@ -0,0 +1,2 @@
+export PS1='samizdat\$ '
+exec sh
diff --git a/initrd.cpio b/initrd.cpio
deleted file mode 100644
index 877926b..0000000
--- a/initrd.cpio
+++ /dev/null
diff --git a/initrd.sh b/initrd.sh
index 080127c..5e7ed90 100755
--- a/initrd.sh
+++ b/initrd.sh
@@ -1,15 +1,4 @@
 #!/bin/sh
-
-input_base=initrd.cpio
-input_dir=initrd
-output=isolinux/live/initrd.img
-
-output_tmp=${output}~
-
-set -e
-
-cp -f --reflink=auto "$input_base" "$output_tmp"
-# (cat "$input_base"; cd "$input_dir"; find . -depth|cpio -ov|gzip -c) > "$output"~
-(cd "$input_dir"; find . -depth|cpio -H newc -ov -A -O "../$output_tmp")
-gzip "$output_tmp"
-mv -f "$output_tmp".gz "$output"
+set -ex
+cp -f /boot/vmlinuz-$(uname -r) isolinux/live/vmlinuz
+/usr/sbin/mkinitramfs -d initramfs-tools -o isolinux/live/initrd.img $(uname -r)
diff --git a/initrd/init b/initrd/init
deleted file mode 100755
index 10addb5..0000000
--- a/initrd/init
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec sh
diff --git a/isolinux/live.cfg b/isolinux/live.cfg
index d8161a9..698d681 100644
--- a/isolinux/live.cfg
+++ b/isolinux/live.cfg
@@ -1,12 +1,12 @@
 label live-amd64
-        menu label ^Live (amd64)
+        menu label ^Samizdat (amd64)
         menu default
         linux /live/vmlinuz
         initrd /live/initrd.img
-        append boot=live components quiet splash
+        append components quiet splash
 
 label live-amd64-failsafe
-        menu label ^Live (amd64 failsafe)
+        menu label ^Samizdat (amd64 failsafe)
         linux /live/vmlinuz
         initrd /live/initrd.img
-        append boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal
+        append components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal