summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xinitramfs-tools/hooks/samizdat2
-rw-r--r--initramfs-tools/scripts/samizdat1
-rw-r--r--[l---------]isolinux/pxelinux.cfg/default6
3 files changed, 8 insertions, 1 deletions
diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index c854186..81d41f2 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -33,4 +33,6 @@ CopyExec vol_id.txt /lib/samizdat/vol_id.txt
33modules='loop xts dm-crypt' 33modules='loop xts dm-crypt'
34for m in $modules; do force_load "$m" || exit 1; done 34for m in $modules; do force_load "$m" || exit 1; done
35 35
36copy_modules_dir "/lib/modules/$(uname -r)/kernel/drivers/net/ethernet" || exit 1
37
36exit 0 38exit 0
diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index 374d95d..8265c45 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -6,6 +6,7 @@ mountroot()
6 6
7 samizdat_install_udev_rules 7 samizdat_install_udev_rules
8 mkfifo "$MENUFIFO" 8 mkfifo "$MENUFIFO"
9 sh /scripts/local-top/nbd & # I guess this isn't getting called otherwise?
9 bootmenu 10 bootmenu
10 bootwait root-mounted 11 bootwait root-mounted
11 chvt 1 12 chvt 1
diff --git a/isolinux/pxelinux.cfg/default b/isolinux/pxelinux.cfg/default
index 99fb271..af54e61 120000..100644
--- a/isolinux/pxelinux.cfg/default
+++ b/isolinux/pxelinux.cfg/default
@@ -1 +1,5 @@
1../isolinux.cfg \ No newline at end of file 1default live-amd64
2label live-amd64
3 linux /live/vmlinuz
4 initrd /live/initrd.img
5 append boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.iso nbddev=/dev/nbd0 ip=dhcp