diff options
Diffstat (limited to 'src')
-rwxr-xr-x | src/grub-efi.sh | 1 | ||||
-rwxr-xr-x | src/initrd.sh | 2 | ||||
-rw-r--r-- | src/initrd/initrd-dependencies.txt | 14 | ||||
-rwxr-xr-x | src/initrd/patchroot.sh (renamed from src/patchroot.sh) | 0 | ||||
-rw-r--r-- | src/initrd/vol_id.txt | 1 | ||||
-rwxr-xr-x | src/qemu.sh | 2 | ||||
-rw-r--r-- | src/samizdat-paths.sh | 6 | ||||
-rw-r--r-- | src/xorriso-usb.sh | 6 |
8 files changed, 28 insertions, 4 deletions
diff --git a/src/grub-efi.sh b/src/grub-efi.sh index e2d50f6..e722990 100755 --- a/src/grub-efi.sh +++ b/src/grub-efi.sh | |||
@@ -32,6 +32,7 @@ EOF | |||
32 | } | 32 | } |
33 | 33 | ||
34 | real_destdir=$samizdat_grub_efi_dir | 34 | real_destdir=$samizdat_grub_efi_dir |
35 | [ "$real_destdir" ] || exit 1 | ||
35 | destdir=$real_destdir.tmp | 36 | destdir=$real_destdir.tmp |
36 | 37 | ||
37 | set -e | 38 | set -e |
diff --git a/src/initrd.sh b/src/initrd.sh index 8cc8ea1..458d0f5 100755 --- a/src/initrd.sh +++ b/src/initrd.sh | |||
@@ -1,5 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | . samizdat-paths.sh | ||
4 | |||
3 | initrd=${samizdat_isolinux_dir}/linux/initrd.img | 5 | initrd=${samizdat_isolinux_dir}/linux/initrd.img |
4 | vmlinuz=${samizdat_isolinux_dir}/linux/vmlinuz | 6 | vmlinuz=${samizdat_isolinux_dir}/linux/vmlinuz |
5 | 7 | ||
diff --git a/src/initrd/initrd-dependencies.txt b/src/initrd/initrd-dependencies.txt new file mode 100644 index 0000000..cf73861 --- /dev/null +++ b/src/initrd/initrd-dependencies.txt | |||
@@ -0,0 +1,14 @@ | |||
1 | expect | ||
2 | pgpdump | ||
3 | monkeysphere | ||
4 | libmime-base32-perl | ||
5 | pinentry-curses | ||
6 | mdadm | ||
7 | ntfs-3g | ||
8 | hfsplus | ||
9 | isolinux | ||
10 | nbd-client | ||
11 | cryptsetup | ||
12 | hfsprogs | ||
13 | grub-pc | ||
14 | initramfs-tools | ||
diff --git a/src/patchroot.sh b/src/initrd/patchroot.sh index 738beac..738beac 100755 --- a/src/patchroot.sh +++ b/src/initrd/patchroot.sh | |||
diff --git a/src/initrd/vol_id.txt b/src/initrd/vol_id.txt new file mode 100644 index 0000000..6633321 --- /dev/null +++ b/src/initrd/vol_id.txt | |||
@@ -0,0 +1 @@ | |||
SamizdatLive | |||
diff --git a/src/qemu.sh b/src/qemu.sh index dfed521..3b355b4 100755 --- a/src/qemu.sh +++ b/src/qemu.sh | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | . samizdat-path.sh | 3 | . samizdat-paths.sh |
4 | 4 | ||
5 | # iso=debian-live-8.4.0-amd64-gnome-desktop.iso | 5 | # iso=debian-live-8.4.0-amd64-gnome-desktop.iso |
6 | # iso=debian-live-8.4.0-amd64-standard.iso | 6 | # iso=debian-live-8.4.0-amd64-standard.iso |
diff --git a/src/samizdat-paths.sh b/src/samizdat-paths.sh index c437c5b..5980ba6 100644 --- a/src/samizdat-paths.sh +++ b/src/samizdat-paths.sh | |||
@@ -1,5 +1,7 @@ | |||
1 | samizdat_initrd_files_dir=/home/d/sami/src/initrd | 1 | samizdat_initrd_files_dir=/home/d/sami/src/initrd |
2 | samizdat_execs_dir=/home/d/src/samizdat | 2 | samizdat_execs_dir=/home/d/src/samizdat |
3 | samizdat_child_dir=./child | 3 | samizdat_child_dir=/home/d/sami/child |
4 | samizdat_isolinux_dir=/home/d/sami/isolinux | 4 | samizdat_isolinux_dir=/home/d/sami/isolinux |
5 | PATH=${libexecdir}/${PACKAGE}/bin:${PATH} | 5 | samizdat_grub_efi_dir=/home/d/sami/grub-efi |
6 | samizdat_iso_dir=/home/d/sami | ||
7 | PATH=/usr/local/samizdat/bin:${PATH} | ||
diff --git a/src/xorriso-usb.sh b/src/xorriso-usb.sh index 61fcda0..7ff9825 100644 --- a/src/xorriso-usb.sh +++ b/src/xorriso-usb.sh | |||
@@ -35,6 +35,10 @@ fi | |||
35 | 35 | ||
36 | for fs; do | 36 | for fs; do |
37 | [ -f "$fs" ] || die "not a file: $fs" | 37 | [ -f "$fs" ] || die "not a file: $fs" |
38 | case "$fs" in | ||
39 | *.btrfs) ;; | ||
40 | *) die "invalid name (does not match *.btrfs): $fs" ;; | ||
41 | esac | ||
38 | shift | 42 | shift |
39 | set -- "$@" "rootfs/${fs##*/}=$fs" | 43 | set -- "$@" "rootfs/${fs##*/}=$fs" |
40 | done | 44 | done |
@@ -137,7 +141,7 @@ if [ "$QUICK_TEST" ]; then | |||
137 | fi | 141 | fi |
138 | 142 | ||
139 | if [ "$REPLACE_INITRD" ]; then | 143 | if [ "$REPLACE_INITRD" ]; then |
140 | initrd.sh | 144 | initrd.sh || die 'initrd.sh failed' |
141 | fi | 145 | fi |
142 | 146 | ||
143 | (set -x | 147 | (set -x |