projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further bugfixes.
[grml2usb.git]
/
grml2iso
diff --git
a/grml2iso
b/grml2iso
index
1dd2f6a
..
e84e267
100755
(executable)
--- a/
grml2iso
+++ b/
grml2iso
@@
-86,15
+86,16
@@
Options:
case $name in
o) ISOFILE="$OPTARG";;
b) GRML2USB_OPTS+=(--bootoptions="$OPTARG");;
case $name in
o) ISOFILE="$OPTARG";;
b) GRML2USB_OPTS+=(--bootoptions="$OPTARG");;
- c) DIR="$(readlink -f "$OPTARG")";;
+ c) DIR="$(readlink -f "$OPTARG")";
[ -n "$DIR" ] || { echo "Could not read $OPTARG - exiting" >&2 ; exit 1 ; } ;
;
f) FORCE='true';;
r) GRML2USB_OPTS+=(--remove-bootoption="$OPTARG");;
p) GRML2USB_OPTS+=("$OPTARG");;
s) URI="$OPTARG";;
f) FORCE='true';;
r) GRML2USB_OPTS+=(--remove-bootoption="$OPTARG");;
p) GRML2USB_OPTS+=("$OPTARG");;
s) URI="$OPTARG";;
- t) WRKDIR="$
OPTARG
";;
+ t) WRKDIR="$
(readlink -f "$OPTARG")
";;
?) usage 2;;
esac
done
?) usage 2;;
esac
done
+
# test for specified URI
if [ -n "$URI" ] ; then
GRML2USB_OPTS+=(--bootoptions="fetch=$URI")
# test for specified URI
if [ -n "$URI" ] ; then
GRML2USB_OPTS+=(--bootoptions="fetch=$URI")
@@
-128,7
+129,8
@@
Options:
# check for grml2usb {{{
if [ ! -x "$(which $GRML2USB)" ] && [ ! -x "$GRML2USB" ] ; then
# check for grml2usb {{{
if [ ! -x "$(which $GRML2USB)" ] && [ ! -x "$GRML2USB" ] ; then
- echo >&2 "Error: Could not find grml2usb"
+ echo "Error: Could not find grml2usb executable. Is /usr/sbin missing in PATH?" >&2
+ echo "Tip: run GRML2USB=/usr/sbin/grml2usb grml2iso ... as workaround" >&2
if [ -x "./$GRML2USB" ] ; then
echo >&2 "If you executed grml2iso from the grml2usb repository use"
echo >&2 "GRML2USB=./grml2usb $0 $*"
if [ -x "./$GRML2USB" ] ; then
echo >&2 "If you executed grml2iso from the grml2usb repository use"
echo >&2 "GRML2USB=./grml2usb $0 $*"
@@
-162,10
+164,16
@@
Options:
# move syslinux to isolinux {{{
mv "$WRKDIR"/cddir/boot/syslinux "$WRKDIR"/cddir/boot/isolinux
# move syslinux to isolinux {{{
mv "$WRKDIR"/cddir/boot/syslinux "$WRKDIR"/cddir/boot/isolinux
+ echo "menu label ^Isolinux prompt" > "$WRKDIR"/cddir/boot/isolinux/promptname.cfg
+ echo "include hd.cfg" >> "$WRKDIR"/cddir/boot/isolinux/grmlmain.cfg
+# }}}
+# change to $WRKDIR {{{
+ # make sure $WRKDIR is an absolute path, otherwise accessing files
+ # in it will fail later in the code path if user provided a
+ # relative directory
+ WRKDIR=$(realpath $WRKDIR)
cd "$WRKDIR/cddir"
cd "$WRKDIR/cddir"
- echo "menu label ^Isolinux prompt" > boot/isolinux/promptname.cfg
- echo "include hd.cfg" >> boot/isolinux/grmlmain.cfg
# }}}
# efi boot {{{
# }}}
# efi boot {{{