add kernel modules to initrd needed for hfsplus

1 files changed, 25 insertions, 8 deletions

diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index a782a6b..5b1971b 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -12,12 +12,24 @@ path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryp
 
 for c in $path_execs; do CopyExec "$(which $c)" /bin; done
 
-CopyExec /bin/openvt /bin/OpenVT
-CopyExec /sbin/losetup /bin/LoSetup
-
-CopyExec patchroot.sh /patchroot/patchroot.sh
-CopyExec /etc/apt/sources.list /patchroot/sources.list
-CopyExec initrd-dependencies.txt /patchroot/initrd-dependencies.txt
+graft_paths="
+    /bin/OpenVT=/bin/openvt
+    /bin/LoSetup=/sbin/losetup
+    /patchroot/patchroot.sh=patchroot.sh
+    /patchroot/sources.list=/etc/apt/sources.list
+    /patchroot/initrd-dependencies.txt=initrd-dependencies.txt
+"
+
+for e in $graft_paths; do
+    case "$e" in
+        *=*)
+            dest=${e%%=*}
+            src=${e#*=}
+            CopyExec "$src" "$dest"
+            ;;
+        *) exit 1 ;;
+    esac
+done
 
 absolute_path_copies='/lib/terminfo/l/linux'
 
@@ -30,9 +42,14 @@ for c in $samizdat_execs; do CopyExec ${samizdat_execs_dir}/$c /bin; done
 
 CopyExec vol_id.txt /lib/samizdat/vol_id.txt
 
-modules='loop xts dm-crypt'
+modules='loop xts dm-crypt hfs hfsplus'
 for m in $modules; do force_load "$m" || exit 1; done
 
-copy_modules_dir "/lib/modules/${version}/kernel/drivers/net/ethernet" || exit 1
+sex() { (set -x; "$@"); }
+
+modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls'
+for dir in $modules_dirs; do
+    copy_modules_dir "$dir" || exit 1
+done
 
 exit 0