projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 0.15.0
[grml2usb.git]
/
grml2iso
diff --git
a/grml2iso
b/grml2iso
index
4556917
..
d8f4be5
100755
(executable)
--- a/
grml2iso
+++ b/
grml2iso
@@
-7,6
+7,9
@@
# License: This file is licensed under the GPL v2 or any later version.
################################################################################
# License: This file is licensed under the GPL v2 or any later version.
################################################################################
+# make sure we have the sbin directories in our PATH to find grml2usb ootb
+PATH="${PATH}:/sbin:/usr/local/sbin:/usr/sbin"
+
# define function getfilesize before "set -e" {{{
if stat --help >/dev/null 2>&1; then
getfilesize='stat -c %s' # GNU stat
# define function getfilesize before "set -e" {{{
if stat --help >/dev/null 2>&1; then
getfilesize='stat -c %s' # GNU stat
@@
-29,12
+32,12
@@
elif which mkisofs >/dev/null 2>&1; then
elif which genisoimage >/dev/null 2>&1; then
MKISOFS='genisoimage'
else
elif which genisoimage >/dev/null 2>&1; then
MKISOFS='genisoimage'
else
- echo
>&2 "Error: neither mkisofs nor genisoimage available - can not create ISO."
+ echo
"Error: neither xorriso nor mkisofs nor genisoimage available - can not create ISO." >&2
exit 1
fi
if ! which isohybrid >/dev/null 2>&1 ; then
exit 1
fi
if ! which isohybrid >/dev/null 2>&1 ; then
- echo "Error: isohybrid executable not found (install syslinux?)." >&2
+ echo "Error: isohybrid executable not found (install syslinux
/isolinux/syslinux-utils
?)." >&2
exit 1
fi
# }}}
exit 1
fi
# }}}
@@
-179,7
+182,7
@@
Options:
# efi boot {{{
# default, independent of UEFI support
BOOT_ARGS="-no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat"
# efi boot {{{
# default, independent of UEFI support
BOOT_ARGS="-no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat"
- UEFI_ENABLE=
tru
e
+ UEFI_ENABLE=
fals
e
case "$MKISOFS" in
xorriso*)
case "$MKISOFS" in
xorriso*)
@@
-188,6
+191,7
@@
Options:
echo "Disabling (U)EFI boot support since xorriso version is not recent enough."
else
echo "xorriso with -eltorito-alt-boot support present"
echo "Disabling (U)EFI boot support since xorriso version is not recent enough."
else
echo "xorriso with -eltorito-alt-boot support present"
+ UEFI_ENABLE=true
if ! [ -r "${WRKDIR}/cddir/boot/efi.img" ] ; then
echo "Warning: File /boot/efi.img not found, not extending boot arguments for (U)EFI boot."
if ! [ -r "${WRKDIR}/cddir/boot/efi.img" ] ; then
echo "Warning: File /boot/efi.img not found, not extending boot arguments for (U)EFI boot."
@@
-199,10
+203,7
@@
Options:
fi
;;
*)
fi
;;
*)
- if ! [ -r "${WRKDIR}/cddir/boot/efi.img" ] ; then
- echo "Warning: File /boot/efi.img not found."
- UEFI_ENABLE=false
- fi
+ echo "Using $MKISOFS for ISO generation (lacking UEFI option), disabling (U)EFI boot support."
;;
esac
# }}}
;;
esac
# }}}
@@
-284,7
+285,7
@@
Options:
# make ISO dd-able {{{
if ! $UEFI_ENABLE ; then
# make ISO dd-able {{{
if ! $UEFI_ENABLE ; then
- echo "Skipping check for --uefi option in isohybrid since
/boot/efi.img does not exist
."
+ echo "Skipping check for --uefi option in isohybrid since
prerequisites are not fulfilled
."
else
if ! isohybrid --help | grep -q -- --uefi ; then
echo "isohybrid version does NOT support --uefi option, disabling"
else
if ! isohybrid --help | grep -q -- --uefi ; then
echo "isohybrid version does NOT support --uefi option, disabling"
@@
-292,10
+293,10
@@
Options:
echo "isohybrid version supports --uefi option"
ISOHYBRID_OPTIONS=--uefi
fi
echo "isohybrid version supports --uefi option"
ISOHYBRID_OPTIONS=--uefi
fi
-
- echo "Creating dd-able ISO using isohybrid"
- isohybrid $ISOHYBRID_OPTIONS "$ISOFILE"
fi
fi
+
+ echo "Creating dd-able ISO using isohybrid"
+ isohybrid $ISOHYBRID_OPTIONS "$ISOFILE"
# }}}
# cleanup {{{
# }}}
# cleanup {{{