X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=cdf9262ca1cf92b6ad48b22c10646da1ab673cd5;hp=a1eb11763acdf342f6916b3804cdc2bf953443a9;hb=e5ae97fdf02635dee08648b2f2fb4006db269b17;hpb=ddc9af567453c83d1d08fa55ed9c4a6d406f6ebc diff --git a/grml2iso b/grml2iso index a1eb117..cdf9262 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,10 +6,6 @@ # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. ################################################################################ -# TODO: -# * support isolinux as bootloader on the ISO -# * support setting grml2usb options (e.g. --bootoptions=...) -################################################################################ # define function getfilesize before "set -e" {{{ if stat --help >/dev/null 2>&1; then @@ -24,13 +20,45 @@ [ -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 {{{ set -e usage() { - echo >&2 "Usage: $0 -o target.iso source1.iso [source2.iso ...]" + 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. + -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 } # }}} @@ -39,23 +67,41 @@ [[ $# -gt 2 ]] || usage 1 ISOFILE='' - while getopts ao: name; do + DIR='' + ADD_OPTS='' + FORCE='' + URI='' + typeset -a GRML2USB_OPTS + while getopts fb:c:o:r:p:s: name; do case $name in o) ISOFILE="$OPTARG";; + b) GRML2USB_OPTS+=(--bootoptions="$OPTARG");; + c) DIR="$OPTARG";; + 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 # we don't to override any files by accident - if [ -e "$ISOFILE" ]; then + if [ -e "$ISOFILE" -a ! -n "$FORCE" ]; then echo "Error: target file $ISOFILE exists already." >&2 exit 1 fi - shift $(($OPTIND - 1)) + if [ ! -z "$DIR" -a ! -d "$DIR" ] ; then + echo "Error: specified parameter for -c is not a directory" >&2 + exit 1 + fi # }}} # we need root permissions for executing grml2usb {{{ @@ -65,6 +111,17 @@ 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 @@ -80,43 +137,58 @@ # create necessary stuff under WRKDIR {{{ [ -d "$WRKDIR" ] && WRKDIR_EXISTED='true' || WRKDIR_EXISTED='false' rm -rf "$WRKDIR/cddir" "$WRKDIR/grub_tmp" - mkdir -p "$WRKDIR/cddir" "$WRKDIR/grub_tmp" + mkdir -p "$WRKDIR/cddir" # }}}} # execute grml2usb with all ISOs you'd like to install {{{ - $GRML2USB "$@" "$WRKDIR/cddir" + # remove all parameters + shift $(($OPTIND - 1)) + + $GRML2USB "${GRML2USB_OPTS[@]}" "$@" "$WRKDIR/cddir" # }}} -# install grub2 files {{{ -# as we don't want to rely on a grub2 installation on the -# running system let's grab it from the net - if which dpkg >/dev/null 2>&1 ; then - ARCH="$(dpkg --print-architecture)" - else - [[ $(uname -m) == x86_64 ]] && ARCH=amd64 || ARCH=i386 - fi - GRUB_DEB="${GRUB_VERSION}_${ARCH}.deb" +# move syslinux to isolinux {{{ + mv "$WRKDIR"/cddir/boot/syslinux "$WRKDIR"/cddir/boot/isolinux - cd "$WRKDIR"/grub_tmp/ - wget http://ftp.de.debian.org/debian/pool/main/g/grub2/"$GRUB_DEB" - ar x "$GRUB_DEB" - tar xzf data.tar.gz - ./usr/bin/grub-mkimage -d usr/lib/grub/i386-pc \ - -o "$WRKDIR"/cddir/boot/grub/core.img biosdisk iso9660 + cd "$WRKDIR/cddir" + echo "menu label ^Isolinux prompt" > boot/isolinux/promptname.cfg + echo "include hd.cfg" >> boot/isolinux/grmlmain.cfg +# }}} - for a in usr/lib/grub/i386-pc/{*.mod,efiemu??.o,command.lst,moddep.lst,fs.lst,handler.lst,parttool.lst}; do - test -e $a && cp $a "$WRKDIR"/cddir/boot/grub/ - done +# 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" + rsync -a ${DIR}/ . + fi - cat usr/lib/grub/i386-pc/cdboot.img "$WRKDIR"/cddir/boot/grub/core.img \ - > "$WRKDIR"/cddir/boot/grub/eltorito.img - cd "$WRKDIR/cddir" # }}} # 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/grub/eltorito.img -c boot/grub/eltorito.cat \ + -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \ -o "$ISOFILE" . # }}} @@ -127,25 +199,27 @@ dd if=/dev/zero bs=1 count=1 seek=$ofs of="$ISOFILE" 2>/dev/null # }}} -# create a manifold-boot image with a partition table, if possible {{{ - if mksh -c true 2>/dev/null && \ - test -e /usr/share/grml-live/scripts/bootgrub.mksh; then - echo "Creating a manifold-boot ISO image" - echo 1 63 | \ - mksh /usr/share/grml-live/scripts/bootgrub.mksh -A -M 1 -p 0x83 -g $cyls:16:32 | \ - cat - boot/grub/core.img | \ - dd conv=notrunc of="$ISOFILE" conv=notrunc 2>/dev/null - else - echo "Cannot find mksh or bootgrub.mksh, not generating manifold-boot ISO image" - fi -# }}} - # 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 #########################################################################