X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=1236e2e3e2ae3f2cb85bf26dfd21e4ed9246d1f6;hp=8a07f1a2514793980360845d73139c414880291e;hb=19b2fe785e5357247588698b1fd9f432f3c89c0d;hpb=a9ab0bfbcc7ff337d8439f3420e539d7a9ddeb6b

diff --git a/grml2iso b/grml2iso
index 8a07f1a..1236e2e 100755
--- a/grml2iso
+++ b/grml2iso
@@ -6,9 +6,6 @@
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
-# TODO:
-# * support setting grml2usb options
-################################################################################
 
 # define function getfilesize before "set -e" {{{
   if stat --help >/dev/null 2>&1; then
@@ -41,11 +38,26 @@ fi
     echo >&2 "Usage: $0 [OPTIONS] -o target.iso source1.iso [source2.iso ...]"
     echo >&2 "
 Options:
-     -b Boot Params    Additional boot parameters passed to grml2usb
-     -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.
+     -b Boot Params      Additional boot parameters passed to grml2usb
+     -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.
+     -p <grml2usb param> Add the specified parameter to the grml2usb
+                         commandline. For a list of valid parameters have
+                         a look at the grml2usb manpage.
+                         Can be specified multiple times.
+     -s URI              Generate a small ISO file which downloads the squashfs
+                         file from the specified URI. Please note that due to
+                         restrictions in the bootprocess only IPs are allowed.
+                         Supported protocols are: http and ftp
+
+     Examples:
+     $0 -s http://192.168.23.42:8000/grml/ -o small.iso grml64_2010.12.iso
+
+     Will generate a file small.iso which tries to download the squashfs file from
+     http://192.168.23.42:8000/grml/ - the squashfs file is placed in the same
+     output directory as the ISO file.
 "
     [ -n "$1" ] && exit $1 || exit 1
   }
@@ -58,17 +70,24 @@ Options:
   DIR=''
   ADD_OPTS=''
   FORCE=''
-  typeset -a REMOVE_OPTS
-  while getopts fb:c:o:r: name; do
+  URI=''
+  typeset -a GRML2USB_OPTS
+  while getopts fb:c:o:r:p:s: name; do
     case $name in
       o)   ISOFILE="$OPTARG";;
-      b)   ADD_OPTS="--bootoption="$OPTARG"";;
+      b)   GRML2USB_OPTS+=(--bootoptions="$OPTARG");;
       c)   DIR="$OPTARG";;
       f)   FORCE='true';;
-      r)   REMOVE_OPTS+=(--remove-bootoption="$OPTARG");;
+      r)   GRML2USB_OPTS+=(--remove-bootoption="$OPTARG");;
+      p)   GRML2USB_OPTS+=("$OPTARG");;
+      s)   URI="$OPTARG";;
       ?)   usage 2;;
     esac
   done
+  # test for specified URI
+  if [ -n "$URI" ] ; then
+    GRML2USB_OPTS+=(--bootoptions="fetch=$URI")
+  fi
 
 # make sure -o is specified
   [ -n "$ISOFILE" ] || usage 1
@@ -125,10 +144,9 @@ Options:
   # remove all parameters
   shift $(($OPTIND - 1))
 
-  $GRML2USB "${REMOVE_OPTS[@]}" ${ADD_OPTS:+"$ADD_OPTS"} "$@" "$WRKDIR/cddir"
+  $GRML2USB "${GRML2USB_OPTS[@]}" "$@" "$WRKDIR/cddir"
 # }}}
 
-
 # move syslinux to isolinux {{{
   mv "$WRKDIR"/cddir/boot/syslinux "$WRKDIR"/cddir/boot/isolinux
 
@@ -137,9 +155,31 @@ Options:
   echo "include hd.cfg" >> boot/isolinux/grmlmain.cfg
 # }}}
 
+# adjust ISO for small output if necessary {{{
+  if [ -n "$URI" ] ; then
+     bootloader_files=$(find . -name "*.cfg" -type f)
+     bootloader_files+=" "
+     bootloader_files+=$(find . -name "*.lst" -type f)
+     output_dir=$(dirname "$ISOFILE")
+     for squashfs in $(find . -name *.squashfs) ; do
+        media_path="$(dirname "$squashfs")"
+        filename="$(basename "$squashfs")"
+        target="$output_dir/$filename"
+        if [ -f "$target" ] && [ ! -n "$FORCE" ] ; then
+           echo >&2 "Warning: $target already exists, and -force not specified, not overwriting"
+        else
+           mv $squashfs $target
+           OUTPUT_FILES+=("$target")
+        fi
+        sed -i -e "s#^\(^.*$media_path.*\)\($URI\)\(.*$\)#\1$URI/$filename\3#g" $bootloader_files
+
+   done
+  fi
+# }}}
+
 # copy specified directory to cd {{{
   if [ -n "$DIR" ] ; then
-     echo >&2 "Copying ${DIR} to generated iso"
+     echo >&2 "Copying ${DIR} to generated ISO"
      rsync -a ${DIR}/ .
   fi
 
@@ -159,13 +199,27 @@ Options:
   dd if=/dev/zero bs=1 count=1 seek=$ofs of="$ISOFILE" 2>/dev/null
 # }}}
 
-
 # cleanup {{{
   cd "$ORIG_DIR"
   sync
   rm -rf "$WRKDIR/cddir" "$WRKDIR/grub_tmp"
   [[ $WRKDIR_EXISTED = 'false' ]] && rmdir "$WRKDIR"
   echo "Generated $ISOFILE"
+  if [ -n "$URI" ] ; then
+     echo "
+Information:
+==============
+You requested to generate a small ISO image. Your generated
+ISO image $ISOFILE does _not_ contain the squashfs files from
+the source ISO images.
+
+You have to provide the extracted squashfs files under $URI.
+
+ISO image: $ISOFILE
+Squashfs files: ${OUTPUT_FILES[@]}
+URI: $URI
+"
+  fi
 # }}}
 
 ## EOF #########################################################################