summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xxorriso.sh39
-rwxr-xr-xxorriso.test-efi.sh26
2 files changed, 14 insertions, 51 deletions
diff --git a/xorriso.sh b/xorriso.sh
index dbe5fe8..5068d4b 100755
--- a/xorriso.sh
+++ b/xorriso.sh
@@ -36,23 +36,11 @@ make_gnupghome()
36 36
37make_gnupghome 37make_gnupghome
38 38
39set -ex 39if [ grub-efi.sh -nt grub-efi ]; then
40 40 ./grub-efi.sh || die "Error: grub-efi.sh failed"
41# http://www.syslinux.org/wiki/index.php?title=Isohybrid 41fi
42# xorriso -as mkisofs \
43# -o output.iso \
44# -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin \
45# -c isolinux/boot.cat \
46# -b isolinux/isolinux.bin \
47# -no-emul-boot -boot-load-size 4 -boot-info-table \
48# -eltorito-alt-boot \
49# -e isolinux/efiboot.img \
50# -no-emul-boot \
51# -isohybrid-gpt-basdat \
52# CD_root
53 42
54# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/isolinux/ 43set -ex
55# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/isolinux/efiboot.img
56 44
57xorriso \ 45xorriso \
58 -drive_class clear_list all \ 46 -drive_class clear_list all \
@@ -63,19 +51,16 @@ xorriso \
63 -pathspecs on \ 51 -pathspecs on \
64 \ 52 \
65 \ 53 \
66 -add isolinux -- \
67 -follow link -add "$@" -- -follow default \
68 -add "${gpg_iso_path}=${gnupghome}" -- \ 54 -add "${gpg_iso_path}=${gnupghome}" -- \
55 -add linux=isolinux/linux -- \
56 -follow link -add "$@" -- -follow default \
69 \ 57 \
70 \ 58 \
71 -as mkisofs \ 59 -as mkisofs -graft-points \
72 -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \ 60 -b grub/i386-pc/eltorito.img \
73 -c isolinux/boot.cat \ 61 -no-emul-boot -boot-info-table \
74 -b isolinux/isolinux.bin \ 62 --embedded-boot grub-efi/embedded.img \
75 -no-emul-boot -boot-load-size 4 -boot-info-table \ 63 --protective-msdos-label \
76 -eltorito-alt-boot \ 64 grub=grub-efi/grub
77 -e isolinux/efiboot.img \
78 -no-emul-boot \
79 -isohybrid-gpt-basdat \
80 65
81mv -f "$outdev"~ "$outdev" 66mv -f "$outdev"~ "$outdev"
diff --git a/xorriso.test-efi.sh b/xorriso.test-efi.sh
index a32f4d1..3591528 100755
--- a/xorriso.test-efi.sh
+++ b/xorriso.test-efi.sh
@@ -1,6 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2 2
3outdev=test-efi.iso 3outdev=samizdat.iso
4indev=debian-live-8.4.0-amd64-standard.iso 4indev=debian-live-8.4.0-amd64-standard.iso
5volid=SamizdatLive 5volid=SamizdatLive
6gpg_iso_path=gnupghome 6gpg_iso_path=gnupghome
@@ -37,27 +37,11 @@ make_gnupghome()
37make_gnupghome 37make_gnupghome
38 38
39if [ grub-efi.sh -nt grub-efi ]; then 39if [ grub-efi.sh -nt grub-efi ]; then
40 ./grub-efi.sh 40 ./grub-efi.sh || die "Error: grub-efi.sh failed"
41fi 41fi
42 42
43set -ex 43set -ex
44 44
45# http://www.syslinux.org/wiki/index.php?title=Isohybrid
46# xorriso -as mkisofs \
47# -o output.iso \
48# -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin \
49# -c isolinux/boot.cat \
50# -b isolinux/isolinux.bin \
51# -no-emul-boot -boot-load-size 4 -boot-info-table \
52# -eltorito-alt-boot \
53# -e isolinux/efiboot.img \
54# -no-emul-boot \
55# -isohybrid-gpt-basdat \
56# CD_root
57
58# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/isolinux/
59# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/isolinux/efiboot.img
60
61xorriso \ 45xorriso \
62 -drive_class clear_list all \ 46 -drive_class clear_list all \
63 -outdev "$outdev"~ \ 47 -outdev "$outdev"~ \
@@ -78,10 +62,4 @@ xorriso \
78 --protective-msdos-label \ 62 --protective-msdos-label \
79 grub=grub-efi/grub 63 grub=grub-efi/grub
80 64
81# -add isolinux -- \
82# -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin \
83# -isohybrid-gpt-basdat
84
85# -add boot/eltorito.img=/home/d/src/grb/rescue/iso/boot/grub/i386-pc/eltorito.img -- \
86
87mv -f "$outdev"~ "$outdev" 65mv -f "$outdev"~ "$outdev"