diff options
-rw-r--r-- | Makefile | 29 | ||||
-rwxr-xr-x | initramfs-tools/hooks/samizdat | 9 | ||||
-rw-r--r-- | samizdat-paths.sh | 7 | ||||
-rwxr-xr-x | src/grub-efi.sh | 1 | ||||
-rwxr-xr-x | src/initrd.sh | 2 | ||||
-rw-r--r-- | src/initrd/initrd-dependencies.txt (renamed from initrd-dependencies.txt) | 0 | ||||
-rwxr-xr-x | src/initrd/patchroot.sh (renamed from src/patchroot.sh) | 0 | ||||
-rw-r--r-- | src/initrd/vol_id.txt (renamed from vol_id.txt) | 0 | ||||
-rwxr-xr-x | src/qemu.sh | 2 | ||||
-rw-r--r-- | src/samizdat-paths.sh | 6 | ||||
-rw-r--r-- | src/xorriso-usb.sh | 6 |
11 files changed, 35 insertions, 27 deletions
@@ -2,22 +2,25 @@ PACKAGE=samizdat-rhizome | |||
2 | prefix=/usr/local | 2 | prefix=/usr/local |
3 | exec_prefix=${prefix} | 3 | exec_prefix=${prefix} |
4 | bindir=${exec_prefix}/bin | 4 | bindir=${exec_prefix}/bin |
5 | libdir=${exec_prefix}/lib | 5 | # libdir=${exec_prefix}/lib |
6 | includedir=${prefix}/include | 6 | # includedir=${prefix}/include |
7 | datarootdir=${prefix}/share | 7 | # datarootdir=${prefix}/share |
8 | datadir=${datarootdir} | 8 | # datadir=${datarootdir} |
9 | mandir=${datarootdir}/man | 9 | # mandir=${datarootdir}/man |
10 | infodir=${datarootdir}/info | 10 | # infodir=${datarootdir}/info |
11 | docdir=${datarootdir}/doc/${PACKAGE} | 11 | # docdir=${datarootdir}/doc/${PACKAGE} |
12 | sysconfdir=$(prefix)/etc | 12 | # sysconfdir=$(prefix)/etc |
13 | libexecdir=$(exec_prefix)/libexec | 13 | # libexecdir=$(exec_prefix)/libexec |
14 | 14 | ||
15 | all: | ||
16 | @echo unimplemented | ||
15 | 17 | ||
16 | bin_programs=xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh btrfs-send-root.sh var.sh | 18 | bin_programs=$(addprefix src/, xorriso-usb.sh btrfs-functions.sh btrfs-receive-root.sh btrfs-send-root.sh var.sh grub-efi.sh keygen.sh initrd.sh samizdat-paths.sh) |
17 | data_files= | 19 | data_files= |
18 | libexec_programs=grub-efi.sh keygen.sh initrd.sh | 20 | libexec_programs= |
19 | 21 | ||
20 | install: | 22 | install: |
21 | install ${bin_programs} ${bindir} | 23 | install ${bin_programs} ${bindir} |
22 | install ${libexec_programs} ${libexecdir} | 24 | |
23 | install ${data_files} ${datadir}/${PACKAGE} | 25 | # install ${libexec_programs} ${libexecdir} |
26 | # install ${data_files} ${datadir}/${PACKAGE} | ||
diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat index eb4497f..db2fd1c 100755 --- a/initramfs-tools/hooks/samizdat +++ b/initramfs-tools/hooks/samizdat | |||
@@ -5,8 +5,11 @@ | |||
5 | CopyExec() { copy_exec "$@" || exit 1; } | 5 | CopyExec() { copy_exec "$@" || exit 1; } |
6 | 6 | ||
7 | . /usr/share/initramfs-tools/hook-functions | 7 | . /usr/share/initramfs-tools/hook-functions |
8 | PATH=/usr/local/bin:$PATH | ||
8 | . samizdat-paths.sh | 9 | . samizdat-paths.sh |
9 | 10 | ||
11 | set -x | ||
12 | |||
10 | repo_execs=$(echo "${samizdat_initrd_files_dir}"/*) | 13 | repo_execs=$(echo "${samizdat_initrd_files_dir}"/*) |
11 | 14 | ||
12 | path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus' | 15 | path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus' |
@@ -14,10 +17,10 @@ path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryp | |||
14 | graft_paths=" | 17 | graft_paths=" |
15 | /bin/OpenVT=/bin/openvt | 18 | /bin/OpenVT=/bin/openvt |
16 | /bin/LoSetup=/sbin/losetup | 19 | /bin/LoSetup=/sbin/losetup |
17 | /patchroot/patchroot.sh=patchroot.sh | 20 | /patchroot/patchroot.sh=${samizdat_initrd_files_dir}/patchroot.sh |
18 | /patchroot/sources.list=/etc/apt/sources.list | 21 | /patchroot/sources.list=/etc/apt/sources.list |
19 | /patchroot/initrd-dependencies.txt=initrd-dependencies.txt | 22 | /patchroot/initrd-dependencies.txt=${samizdat_initrd_files_dir}/initrd-dependencies.txt |
20 | /lib/samizdat/vol_id.txt=vol_id.txt | 23 | /lib/samizdat/vol_id.txt=${samizdat_initrd_files_dir}/vol_id.txt |
21 | " | 24 | " |
22 | 25 | ||
23 | absolute_path_copies='/lib/terminfo/l/linux' | 26 | absolute_path_copies='/lib/terminfo/l/linux' |
diff --git a/samizdat-paths.sh b/samizdat-paths.sh deleted file mode 100644 index e417849..0000000 --- a/samizdat-paths.sh +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | samizdat_initrd_files_dir=/home/d/sami/src/initrd | ||
2 | samizdat_execs_dir=/home/d/src/samizdat | ||
3 | samizdat_child_dir=/home/d/sami/child | ||
4 | samizdat_isolinux_dir=/home/d/sami/isolinux | ||
5 | samizdat_grub_efi_dir=/home/d/sami/grub-efi | ||
6 | samizdat_iso_dir=/home/d/sami | ||
7 | PATH=${libexecdir}/${PACKAGE}/bin:${PATH} | ||
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/initrd-dependencies.txt b/src/initrd/initrd-dependencies.txt index cf73861..cf73861 100644 --- a/initrd-dependencies.txt +++ b/src/initrd/initrd-dependencies.txt | |||
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/vol_id.txt b/src/initrd/vol_id.txt index 6633321..6633321 100644 --- a/vol_id.txt +++ b/src/initrd/vol_id.txt | |||
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 |