From: Michael Prokop <mika@grml.org>
Date: Fri, 5 Oct 2012 10:29:31 +0000 (+0200)
Subject: grml2iso: use absolute path for working directory to not fail when user specified... 
X-Git-Tag: v0.13.3~3
X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=7705455fc160164747fbbd44343fb6e3c833d45a;hp=3767929f5de1107e035bf00aded4ef283ffe04bc;ds=sidebyside

grml2iso: use absolute path for working directory to not fail when user specified relative path

Otherwise using for example:

| # grml2iso -t builddir ...

fails with:

| isohybrid version supports --uefi option, enabling
| Creating dd-able ISO using isohybrid
| isohybrid: [snip]/image.iso: unable to find efi image
---

diff --git a/grml2iso b/grml2iso
index 1dd2f6a..0addfb7 100755
--- a/grml2iso
+++ b/grml2iso
@@ -95,6 +95,7 @@ Options:
       ?)   usage 2;;
     esac
   done
+
   # test for specified URI
   if [ -n "$URI" ] ; then
     GRML2USB_OPTS+=(--bootoptions="fetch=$URI")
@@ -162,10 +163,16 @@ Options:
 
 # 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"
-  echo "menu label ^Isolinux prompt" > boot/isolinux/promptname.cfg
-  echo "include hd.cfg" >> boot/isolinux/grmlmain.cfg
 # }}}
 
 # efi boot {{{