X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=7e926664bc0495b3ca2a91ef721c488e17daa095;hp=3e48b35517235f15c999dfd043dd82487e4ea210;hb=178cb6a106bbfe0e671272bf402bb485b838749d;hpb=7494e3f255313238eda9d6bfe3f96648b9adbb38

diff --git a/grml2iso b/grml2iso
index 3e48b35..7e92666 100755
--- a/grml2iso
+++ b/grml2iso
@@ -19,6 +19,7 @@
 # path to the grml2usb script you'd like to use
   [ -n "$GRML2USB" ] || GRML2USB='grml2usb'
 # work directory for creating the filesystem
+  [ -n "$TMPDIR" ]   && WRKDIR="${TMPDIR}/grml2iso.tmp"
   [ -n "$WRKDIR" ]   || WRKDIR='/tmp/grml2iso.tmp'
 # support mkisofs as well as genisoimage
 if which xorriso >/dev/null 2>&1 ; then
@@ -44,7 +45,7 @@ Options:
      -c Directory        Copy files from directory to generated ISO
      -f                  Force overwrite of existing target.iso
      -r BootParam        Remove specified boot params.
-                         Could be specfied multiple times.
+                         Can be specified multiple times.
      -p <grml2usb param> Add the specified parameter to the grml2usb
                          commandline. For a list of valid parameters have
                          a look at the grml2usb manpage.
@@ -53,6 +54,8 @@ Options:
                          file from the specified URI. Please note that due to
                          restrictions in the bootprocess only IPs are allowed.
                          Supported protocols are: http and ftp
+     -t Directory        Directory that should be used for temporary files
+                         during build. Defaults to /tmp/grml2iso.tmp if unset.
 
      Examples:
      $0 -s http://192.168.23.42:8000/grml/ -o small.iso grml64_2010.12.iso
@@ -74,7 +77,7 @@ Options:
   FORCE=''
   URI=''
   typeset -a GRML2USB_OPTS
-  while getopts fb:c:o:r:p:s: name; do
+  while getopts fb:c:o:r:p:s:t: name; do
     case $name in
       o)   ISOFILE="$OPTARG";;
       b)   GRML2USB_OPTS+=(--bootoptions="$OPTARG");;
@@ -83,6 +86,7 @@ Options:
       r)   GRML2USB_OPTS+=(--remove-bootoption="$OPTARG");;
       p)   GRML2USB_OPTS+=("$OPTARG");;
       s)   URI="$OPTARG";;
+      t)   WRKDIR="$OPTARG";;
       ?)   usage 2;;
     esac
   done
@@ -91,6 +95,10 @@ Options:
     GRML2USB_OPTS+=(--bootoptions="fetch=$URI")
   fi
 
+  if [ -n "$WRKDIR" ] ; then
+    GRML2USB_OPTS+=(--tmpdir="$WRKDIR")
+  fi
+
 # make sure -o is specified
   [ -n "$ISOFILE" ] || usage 1
 
@@ -248,8 +256,8 @@ Options:
 
 # pad the output ISO to multiples of 256 KiB for partition table support {{{
   siz=$($getfilesize "$ISOFILE")
-  cyls=$(echo "$siz / 512 / 32 / 16 + 1" | bc)  # C=$cyls H=16 S=32
-  ofs=$(echo "$cyls * 16 * 32 * 512 - 1" | bc)  # padding offset (size - 1)
+  cyls=$(($siz / 512 / 32 / 16 + 1))  # C=$cyls H=16 S=32
+  ofs=$(($cyls * 16 * 32 * 512 - 1))  # padding offset (size - 1)
   dd if=/dev/zero bs=1 count=1 seek=$ofs of="$ISOFILE" 2>/dev/null
 # }}}