X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=cdf9262ca1cf92b6ad48b22c10646da1ab673cd5;hp=59929925acd82a2c7cf24373fa50595102b8cb5f;hb=9015273829f8fcee111558dc9ae63cf1012e6178;hpb=d85b3e390008b8659eb9929ec8d28c0ec82e1f89

diff --git a/grml2iso b/grml2iso
index 5992992..cdf9262 100755
--- a/grml2iso
+++ b/grml2iso
@@ -39,13 +39,25 @@ fi
     echo >&2 "
 Options:
      -b Boot Params      Additional boot parameters passed to grml2usb
-     -c Directory        Copy files from directory to generated iso
+     -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,8 +70,9 @@ Options:
   DIR=''
   ADD_OPTS=''
   FORCE=''
+  URI=''
   typeset -a GRML2USB_OPTS
-  while getopts fb:c:o:r:p: name; do
+  while getopts fb:c:o:r:p:s: name; do
     case $name in
       o)   ISOFILE="$OPTARG";;
       b)   GRML2USB_OPTS+=(--bootoptions="$OPTARG");;
@@ -67,9 +80,14 @@ Options:
       f)   FORCE='true';;
       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
@@ -94,7 +112,7 @@ Options:
 # }}}
 
 # check for grml2usb {{{
-  if [ ! -x "$(which $GRML2USB)" ] || [ ! -x "$GRML2USB" ] ; then
+  if [ ! -x "$(which $GRML2USB)" ] && [ ! -x "$GRML2USB" ] ; then
     echo >&2 "Error: Could not find grml2usb"
     if [ -x "./$GRML2USB" ] ; then
       echo >&2 "If you executed grml2iso from the grml2usb repository use"
@@ -129,7 +147,6 @@ Options:
   $GRML2USB "${GRML2USB_OPTS[@]}" "$@" "$WRKDIR/cddir"
 # }}}
 
-
 # move syslinux to isolinux {{{
   mv "$WRKDIR"/cddir/boot/syslinux "$WRKDIR"/cddir/boot/isolinux
 
@@ -138,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
 
@@ -160,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 #########################################################################