X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=d9236eebb7605999d2781a5ca9b82d9b5be61174;hp=661ef86fa5fd45c99e8200ea77cedfdc41e1aca8;hb=f956c82e76971d2706f783b2e7907a14fb0e4196;hpb=863f75014eac9dc7ba1bc5711080e9ded5602b93 diff --git a/grml2iso b/grml2iso index 661ef86..d9236ee 100755 --- a/grml2iso +++ b/grml2iso @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Filename: grml2iso # Purpose: create a multiboot grml ISO using grml2usb # Authors: Michael Prokop , @@ -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,17 @@ [ -n "$GRML2USB" ] || GRML2USB='grml2usb' # work directory for creating the filesystem [ -n "$WRKDIR" ] || WRKDIR='/tmp/grml2iso.tmp' +# support mkisofs as well as genisoimage +if which xorriso >/dev/null 2>&1 ; then + MKISOFS='xorriso -as mkisofs' +elif 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 +40,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. + 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 } @@ -49,17 +72,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"";; - c) DIR="$OPTARG";; + b) GRML2USB_OPTS+=(--bootoptions="$OPTARG");; + c) DIR="$(readlink -f "$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 +104,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,10 +113,19 @@ 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 - GRUB_VERSION="grub-pc_1.96+20080724-16" # normalise path case $ISOFILE in @@ -104,7 +141,10 @@ 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 {{{ @@ -115,18 +155,61 @@ Options: echo "include hd.cfg" >> boot/isolinux/grmlmain.cfg # }}} +# efi boot {{{ + # default, independent of UEFI support + BOOT_ARGS="-no-emul-boot -boot-load-size 4 -boot-info-table -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat" + + case "$MKISOFS" in + xorriso*) + echo "Using xorriso for ISO generation." + if ! dpkg --compare-versions $(dpkg-query -W -f='${Version}\n' xorriso 2>/dev/null) gt-nl 1.1.6-1 ; then + echo "Disabling (U)EFI boot support since xorriso version is not recent enough." + else + echo "xorriso with -eltorito-alt-boot support present" + + if ! [ -r "${WRKDIR}/cddir/boot/efi.img" ] ; then + echo "File /boot/efi.img not found, not extending boot arguments for (U)EFI boot." + else + echo "/boot/efi.img found, extending boot arguments for (U)EFI boot." + BOOT_ARGS="$BOOT_ARGS -boot-info-table -eltorito-alt-boot -e boot/efi.img -no-emul-boot" + fi + fi + ;; + esac +# }}} + +# 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 # }}} # generate the CD/DVD ISO {{{ - 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 \ + $MKISOFS -V 'grml-multiboot' -l -r -J -no-pad $BOOT_ARGS \ -o "$ISOFILE" . # }}} @@ -137,13 +220,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 #########################################################################