X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=e84e2674cfd6f013e8cc9d989a4d2c63a1078ba6;hp=d9236eebb7605999d2781a5ca9b82d9b5be61174;hb=5755759faac878a451d58d5f642209aab8cb45c7;hpb=f956c82e76971d2706f783b2e7907a14fb0e4196 diff --git a/grml2iso b/grml2iso index d9236ee..e84e267 100755 --- a/grml2iso +++ b/grml2iso @@ -19,6 +19,7 @@ # path to the grml2usb script you'd like to use [ -n "$GRML2USB" ] || GRML2USB='grml2usb' # work directory for creating the filesystem + [ -n "$TMPDIR" ] && WRKDIR="${TMPDIR}/grml2iso.tmp" [ -n "$WRKDIR" ] || WRKDIR='/tmp/grml2iso.tmp' # support mkisofs as well as genisoimage if which xorriso >/dev/null 2>&1 ; then @@ -31,6 +32,11 @@ else echo >&2 "Error: neither mkisofs nor genisoimage available - can not create ISO." exit 1 fi + +if ! which isohybrid >/dev/null 2>&1 ; then + echo "Error: isohybrid executable not found (install syslinux?)." >&2 + exit 1 +fi # }}} # helper stuff {{{ @@ -44,7 +50,7 @@ Options: -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. + Can be specified multiple times. -p Add the specified parameter to the grml2usb commandline. For a list of valid parameters have a look at the grml2usb manpage. @@ -53,6 +59,8 @@ Options: file from the specified URI. Please note that due to restrictions in the bootprocess only IPs are allowed. Supported protocols are: http and ftp + -t Directory Directory that should be used for temporary files + during build. Defaults to /tmp/grml2iso.tmp if unset. Examples: $0 -s http://192.168.23.42:8000/grml/ -o small.iso grml64_2010.12.iso @@ -74,23 +82,29 @@ Options: FORCE='' URI='' typeset -a GRML2USB_OPTS - while getopts fb:c:o:r:p:s: name; do + while getopts fb:c:o:r:p:s:t: name; do case $name in o) ISOFILE="$OPTARG";; b) GRML2USB_OPTS+=(--bootoptions="$OPTARG");; - c) DIR="$(readlink -f "$OPTARG")";; + c) DIR="$(readlink -f "$OPTARG")"; [ -n "$DIR" ] || { echo "Could not read $OPTARG - exiting" >&2 ; exit 1 ; } ;; f) FORCE='true';; r) GRML2USB_OPTS+=(--remove-bootoption="$OPTARG");; p) GRML2USB_OPTS+=("$OPTARG");; s) URI="$OPTARG";; + t) WRKDIR="$(readlink -f "$OPTARG")";; ?) usage 2;; esac done + # test for specified URI if [ -n "$URI" ] ; then GRML2USB_OPTS+=(--bootoptions="fetch=$URI") fi + if [ -n "$WRKDIR" ] ; then + GRML2USB_OPTS+=(--tmpdir="$WRKDIR") + fi + # make sure -o is specified [ -n "$ISOFILE" ] || usage 1 @@ -115,7 +129,8 @@ Options: # check for grml2usb {{{ if [ ! -x "$(which $GRML2USB)" ] && [ ! -x "$GRML2USB" ] ; then - echo >&2 "Error: Could not find grml2usb" + echo "Error: Could not find grml2usb executable. Is /usr/sbin missing in PATH?" >&2 + echo "Tip: run GRML2USB=/usr/sbin/grml2usb grml2iso ... as workaround" >&2 if [ -x "./$GRML2USB" ] ; then echo >&2 "If you executed grml2iso from the grml2usb repository use" echo >&2 "GRML2USB=./grml2usb $0 $*" @@ -149,10 +164,16 @@ Options: # move syslinux to isolinux {{{ mv "$WRKDIR"/cddir/boot/syslinux "$WRKDIR"/cddir/boot/isolinux + echo "menu label ^Isolinux prompt" > "$WRKDIR"/cddir/boot/isolinux/promptname.cfg + echo "include hd.cfg" >> "$WRKDIR"/cddir/boot/isolinux/grmlmain.cfg +# }}} +# change to $WRKDIR {{{ + # make sure $WRKDIR is an absolute path, otherwise accessing files + # in it will fail later in the code path if user provided a + # relative directory + WRKDIR=$(realpath $WRKDIR) cd "$WRKDIR/cddir" - echo "menu label ^Isolinux prompt" > boot/isolinux/promptname.cfg - echo "include hd.cfg" >> boot/isolinux/grmlmain.cfg # }}} # efi boot {{{ @@ -203,9 +224,42 @@ Options: # copy specified directory to cd {{{ if [ -n "$DIR" ] ; then echo >&2 "Copying ${DIR} to generated ISO" - rsync -a ${DIR}/ . + for param in GRML_NAME VERSION RELEASENAME DATE SHORT_NAME \ + VERSION BOOTID RELEASE_INFO ; do + EXCLUDE_PARAM="$EXCLUDE_PARAM --exclude **%${param}%**" + done + rsync -a ${DIR}/ $EXCLUDE_PARAM . fi + # adjust files from overlay directory + for GRML_VERSION_FILE in $(find . -name grml-version) ; do + GRML_NAME=$(awk '{print $1}' "$GRML_VERSION_FILE") + VERSION=$(awk '{print $2}' "$GRML_VERSION_FILE") + RELEASENAME=$(sed 's/.*- \(.*\).*\[.*/\1/' "$GRML_VERSION_FILE") + DATE=$(sed 's/.*\[\(.*\)].*/\1/' "$GRML_VERSION_FILE") + SHORT_NAME="$(echo $GRML_NAME | tr -d ',./;\- ')" + RELEASE_INFO="$GRML_NAME $VERSION - $RELEASENAME" + BOOTID=$(cat conf/bootid.txt) + + for param in GRML_NAME VERSION RELEASENAME DATE SHORT_NAME \ + RELEASE_INFO BOOTID ; do + value="$(eval echo '$'"$param")" + + # copy parameterized files from the overlay directory + for file in $(find ${DIR} -name "*%$param%*") ; do + file=${file##$DIR/} + target_dir="$(dirname ${file})" + mkdir -p "$target_dir" || true + cp -r ${DIR}/${file} ./${target_dir}/"$(basename ${file/\%${param}\%/$value})" + done + + # adjust config files + for file in ./boot/isolinux/*.cfg ./boot/isolinux/*.msg \ + ./boot/grub/*.cfg ; do + sed -i "s/%$param%/$value/g" ${file} 2>/dev/null || true + done + done + done # }}} # generate the CD/DVD ISO {{{ @@ -215,11 +269,23 @@ Options: # pad the output ISO to multiples of 256 KiB for partition table support {{{ siz=$($getfilesize "$ISOFILE") - cyls=$(echo "$siz / 512 / 32 / 16 + 1" | bc) # C=$cyls H=16 S=32 - ofs=$(echo "$cyls * 16 * 32 * 512 - 1" | bc) # padding offset (size - 1) + cyls=$(($siz / 512 / 32 / 16 + 1)) # C=$cyls H=16 S=32 + ofs=$(($cyls * 16 * 32 * 512 - 1)) # padding offset (size - 1) dd if=/dev/zero bs=1 count=1 seek=$ofs of="$ISOFILE" 2>/dev/null # }}} +# make ISO dd-able {{{ + if isohybrid --help | grep -q -- --uefi ; then + echo "isohybrid version supports --uefi option, enabling" + ISOHYBRID_OPTIONS=--uefi + else + echo "isohybrid version does NOT support --uefi option, disabling" + fi + + echo "Creating dd-able ISO using isohybrid" + isohybrid $ISOHYBRID_OPTIONS "$ISOFILE" +# }}} + # cleanup {{{ cd "$ORIG_DIR" sync