summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2016-04-29 18:06:09 -0400
committerAndrew Cady <d@jerkface.net>2016-04-29 18:06:09 -0400
commit214eeeda2e015c376c39fa66aa3a906bb6529c58 (patch)
tree0f6fc1dfe545298fbd19d381216e290860cc6e4e
parent5fad94d3f0436662d8abdafd6d4736b081665e5f (diff)
another path fix
-rwxr-xr-xsrc/grub-efi.sh2
-rw-r--r--src/xorriso-usb.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/grub-efi.sh b/src/grub-efi.sh
index e722990..f96149d 100755
--- a/src/grub-efi.sh
+++ b/src/grub-efi.sh
@@ -42,7 +42,7 @@ cp -r /usr/lib/grub/i386-pc/* "${destdir}"/grub/i386-pc/
42rm "${destdir}"/grub/i386-pc/*.img || true 42rm "${destdir}"/grub/i386-pc/*.img || true
43 43
44grub_config > "${destdir}"/load_cfg 44grub_config > "${destdir}"/load_cfg
45set -x 45
46grub-mkimage -O i386-pc -d /usr/lib/grub/i386-pc/ -o "${destdir}"/core.img -c "${destdir}"/load_cfg --prefix=/grub iso9660 biosdisk 46grub-mkimage -O i386-pc -d /usr/lib/grub/i386-pc/ -o "${destdir}"/core.img -c "${destdir}"/load_cfg --prefix=/grub iso9660 biosdisk
47cat /usr/lib/grub/i386-pc/cdboot.img "${destdir}"/core.img > "${destdir}"/grub/i386-pc/eltorito.img 47cat /usr/lib/grub/i386-pc/cdboot.img "${destdir}"/core.img > "${destdir}"/grub/i386-pc/eltorito.img
48cat /usr/lib/grub/i386-pc/boot.img "${destdir}"/core.img > "${destdir}"/embedded.img 48cat /usr/lib/grub/i386-pc/boot.img "${destdir}"/core.img > "${destdir}"/embedded.img
diff --git a/src/xorriso-usb.sh b/src/xorriso-usb.sh
index 01fd436..6cada5e 100644
--- a/src/xorriso-usb.sh
+++ b/src/xorriso-usb.sh
@@ -7,7 +7,7 @@ volid=SamizdatLive
7gpg_iso_path=gnupghome 7gpg_iso_path=gnupghome
8gnupghome= 8gnupghome=
9child_dir=$samizdat_child_dir/child.$$ 9child_dir=$samizdat_child_dir/child.$$
10vmlinuz_dir=$samizdat_isolinux_dir 10vmlinuz_dir=$samizdat_linux_dir
11efi_dir=$samizdat_grub_efi_dir 11efi_dir=$samizdat_grub_efi_dir
12 12
13die() { printf "%s: Error: %s\n" "$0" "$*" >&2; exit 1; } 13die() { printf "%s: Error: %s\n" "$0" "$*" >&2; exit 1; }