From 844d0100fa9220e4991649f9e25806b272d1ec62 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec@redhat.com>
Date: Tue, 2 Dec 2008 11:57:36 +0100
Subject: [PATCH] edit-livecd: optionally append kernel boot params

---
 edit-livecd | 54 ++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 10 deletions(-)

diff --git a/edit-livecd b/edit-livecd
index 0200034..c122eee 100755
--- a/edit-livecd
+++ b/edit-livecd
@@ -25,17 +25,22 @@ warn() { printf '%s: %s\n' "$ME" "$*" >&2; }
 try_h() { printf "Try \`$ME -h' for more information.\n" >&2; }
 die() { warn "$@"; try_h; exit 1; }
 
+NODEIMG_DEFAULT=/usr/share/ovirt-node-image/ovirt-node-image.iso
+CD=$NODEIMG_DEFAULT
+
 usage() {
     case $# in 1) warn "$1"; try_h; exit 1;; esac
     cat <<EOF
-Usage: $ME livecd.iso program
-  livecd.iso - LiveCD ISO to edit
-  program - Arbitrary program/script that is run inside of the livecd root
+Usage: $ME -i LiveCD.iso [-b bootparams] [-p program]
+  -b BOOTPARAMS  optional parameters appended to the kernel command line
+  -i LIVECD.iso  LiveCD ISO to edit (default: $NODEIMG_DEFAULT)
+  -p PROGRAM     Arbitrary program/script that is run inside of the livecd root
             filesystem.  This script is not run in a chroot environment so
             it can access the host filesystem.  The program should be executable
             If program is omitted the script will pause and allow the user in
             another terminal to edit the filesystem manually.  After enter is
             pushed the script will re-package up the ISO.
+  -h             display this help and exit
 
   Example Script:
     #!/bin/sh
@@ -45,22 +50,44 @@ Usage: $ME livecd.iso program
 EOF
 }
 
+# FIXME: instead of requiring a PROGRAM, allow arbitrary shell code,
+# so we can invoke $0 -p 'touch etc/sysconfig/foo' ...
+# This means that if you *do* have a program in the current directory
+# running "$0 -p ./my-script" won't work, since it'll be run with
+# a different working dir.  However, *this* will:
+# $0 -p "$PWD/my-script"
+
 # exit after any error:
 set -e
 
-test $# -lt 1 && { usage; exit 1; }
+err=0 help=0
+while getopts :b:i:p:h c; do
+    case $c in
+        i) CD=$OPTARG;;
+        b) PARAMS=$OPTARG;;
+        p) PROG=$OPTARG;;
+        h) help=1;;
+        '?') err=1; warn "invalid option: \`-$OPTARG'";;
+        :) err=1; warn "missing argument to \`-$OPTARG' option";;
+        *) err=1; warn "internal error: \`-$OPTARG' not handled";;
+    esac
+done
+test $err = 1 && { try_h; exit 1; }
+test $help = 1 && { usage; exit 0; }
 
 # first, check to see we are root
 if [ $( id -u ) -ne 0 ]; then
     die "Must run as root"
 fi
 
-CD=$1
-PROG=$2
-
+# FIXME: don't use which: with bash, it's a separate program
+# FIXME: When failing due to a missing required program, tell the user why.
 which mkisofs mksquashfs sed > /dev/null 2>&1
 
 WDIR=`mktemp -d $PWD/livecd.XXXXXXXXXX`
+# FIXME: fail if $WDIR contains white space or shell meta-characters
+# FIXME: do the same for $CD.
+
 ISO="${CD##*/}"
 ISO="${ISO%.iso}-custom.iso"
 
@@ -79,9 +106,10 @@ function mnt() {
     addExit "df | grep $mp > /dev/null 2>&1 && umount -v $mp"
 }
 
-addExit "rm -Rf $WDIR"
+addExit "rm -rf $WDIR"
 
-LABEL=$(isoinfo -d -i $CD | awk -F ": " '/Volume id:/ {print $2}')
+eval "$(/lib/udev/vol_id $CD)"
+LABEL=$ID_FS_LABEL
 
 # mount the CD image
 mnt "-t auto $CD -o loop,ro" cd
@@ -122,6 +150,13 @@ mksquashfs $WDIR/sq-w/ $WDIR/cd-w/LiveOS/squashfs.img -noappend
 echo ">>> Recomputing MD5 sums"
 ( cd $WDIR/cd-w && find . -type f -not -name md5sum.txt -not -path '*/isolinux/*' -print0 | xargs -0 -- md5sum > md5sum.txt )
 
+if [ -n "$PARAMS" ]; then
+    # FIXME: make the script fail -- or maybe try to
+    # find a usable sed delimiter if $PARAMS contains a slash
+    echo ">>> Appending boot parameters"
+    sed -i 's/^  append .*$/& '"$PARAMS/" "$WDIR/cd-w/isolinux/isolinux.cfg"
+fi
+
 echo ">>> Creating ISO image $ISO"
 mkisofs \
     -V "$LABEL" \
@@ -134,4 +169,3 @@ mkisofs \
 
 # The trap ... callbacks will unmount everything.
 set +e
-
-- 
2.11.4.GIT