X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=379ef68cc4c66e3eb10de9ae6de2ceffced8b4f0;hp=10f270c44c0d6b50e221b5fff45f61cc62d5d021;hb=161f2d52971bd95482a797c6011425a6030b5233;hpb=dc6a084d1fb8a5ea72ca5a2ad5af4d087cbee18a diff --git a/grml2iso b/grml2iso index 10f270c..379ef68 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 @@ -23,6 +20,15 @@ [ -n "$GRML2USB" ] || GRML2USB='grml2usb' # work directory for creating the filesystem [ -n "$WRKDIR" ] || WRKDIR='/tmp/grml2iso.tmp' +# support mkisofs as well as genisoimage + if which mkisofs >/dev/null 2>&1; then + MKISOFS='mkisofs' + elif which genisoimage >/dev/null 2>&1; then + MKISOFS='genisoimage' + else + echo >&2 "Error: neither mkisofs nor genisoimage available - can not create ISO." + exit 1 +fi # }}} # helper stuff {{{ @@ -32,11 +38,26 @@ 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 Add the specified parameter to the grml2usb + commandline. For a list of valid parameters have + a look at the grml2usb manpage. + Could be specfied 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 located in the output + directory as the iso file. " [ -n "$1" ] && exit $1 || exit 1 } @@ -49,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 @@ -74,8 +102,6 @@ Options: echo "Error: specified parameter for -c is not a directory" >&2 exit 1 fi - - shift $(($OPTIND - 1)) # }}} # we need root permissions for executing grml2usb {{{ @@ -85,6 +111,17 @@ Options: fi # }}} +# check for grml2usb {{{ + 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" + echo >&2 "GRML2USB=./grml2usb $0 $*" + fi + exit 1 + fi +# }}} + # variables {{{ ORIG_DIR="$(pwd)" # note: grub-pc_1.96+20090603-1 seems to be b0rken @@ -104,9 +141,13 @@ Options: # }}}} # execute grml2usb with all ISOs you'd like to install {{{ - $GRML2USB "${REMOVE_OPTS[@]}" ${ADD_OPTS:+"$ADD_OPTS"} "$@" "$WRKDIR/cddir" + # remove all parameters + shift $(($OPTIND - 1)) + + $GRML2USB "${GRML2USB_OPTS[@]}" "$@" "$WRKDIR/cddir" # }}} + # move syslinux to isolinux {{{ mv "$WRKDIR"/cddir/boot/syslinux "$WRKDIR"/cddir/boot/isolinux @@ -115,6 +156,28 @@ 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" @@ -124,7 +187,7 @@ Options: # }}} # generate the CD/DVD ISO {{{ - mkisofs -V 'grml-multiboot' -l -r -J -no-pad \ + $MKISOFS -V 'grml-multiboot' -l -r -J -no-pad \ -no-emul-boot -boot-load-size 4 -boot-info-table \ -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \ -o "$ISOFILE" . @@ -144,6 +207,21 @@ Options: 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 #########################################################################