projects
/
grml-live.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f56cc0d
)
grml-live-remaster: Support mkisofs + genisoimage
author
Michael Prokop
<mika@grml.org>
Wed, 25 Apr 2012 14:30:02 +0000
(16:30 +0200)
committer
Michael Prokop
<mika@grml.org>
Wed, 25 Apr 2012 14:42:14 +0000
(16:42 +0200)
remaster/grml-live-remaster
patch
|
blob
|
history
diff --git
a/remaster/grml-live-remaster
b/remaster/grml-live-remaster
index
92ef074
..
d4970a6
100755
(executable)
--- a/
remaster/grml-live-remaster
+++ b/
remaster/grml-live-remaster
@@
-41,7
+41,20
@@
if ! isgrmlcd ; then
fi
# make sure we have what we need {{{
fi
# make sure we have what we need {{{
-check4progs mkisofs stat || exit 1
+if check4progs mkisofs >/dev/null 2>&1 ; then
+ MKISO=mkisofs
+fi
+
+if check4progs genisoimage >/dev/null 2>&1 ; then
+ MKISO=genisoimage
+fi
+
+if [ -z "$MKISO" ] ; then
+ echo "Error: neither mkisofs nor genisoimage available. Exiting." >&2
+ exit 1
+fi
+
+check4progs stat || exit 1
# allow overriding via environment:
if [ -z "$MKSQUASHFS" ] ; then
# allow overriding via environment:
if [ -z "$MKSQUASHFS" ] ; then
@@
-141,7
+154,7
@@
else
ISOLINUX_BOOTCAT=boot.cat
fi
ISOLINUX_BOOTCAT=boot.cat
fi
-
mkisofs
-b $ISOLINUX -no-emul-boot -c $ISOLINUX_BOOTCAT \
+
$MKISO
-b $ISOLINUX -no-emul-boot -c $ISOLINUX_BOOTCAT \
-boot-info-table -boot-load-size 4 -no-pad \
-l -r -J -o "$1" /remaster/iso
# pad for partition table
-boot-info-table -boot-load-size 4 -no-pad \
-l -r -J -o "$1" /remaster/iso
# pad for partition table