X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=10f270c44c0d6b50e221b5fff45f61cc62d5d021;hp=c323e1e9523c2102376ba6397c13e01ec92a0248;hb=e32e549168ac60d8a8c0180be73b2db2ca21a9b5;hpb=fa60c0972f333c8f819b8f0bd8b081ec7da13410

diff --git a/grml2iso b/grml2iso
index c323e1e..10f270c 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 <mika@grml.org>,
@@ -6,7 +6,8 @@
 # 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
+# TODO:
+# * support setting grml2usb options
 ################################################################################
 
 # define function getfilesize before "set -e" {{{
@@ -28,7 +29,15 @@
   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.
+"
     [ -n "$1" ] && exit $1 || exit 1
   }
 # }}}
@@ -37,9 +46,17 @@
   [[ $# -gt 2 ]] || usage 1
 
   ISOFILE=''
-  while getopts ao: name; do
+  DIR=''
+  ADD_OPTS=''
+  FORCE=''
+  typeset -a REMOVE_OPTS
+  while getopts fb:c:o:r: name; do
     case $name in
       o)   ISOFILE="$OPTARG";;
+      b)   ADD_OPTS="--bootoption="$OPTARG"";;
+      c)   DIR="$OPTARG";;
+      f)   FORCE='true';;
+      r)   REMOVE_OPTS+=(--remove-bootoption="$OPTARG");;
       ?)   usage 2;;
     esac
   done
@@ -48,11 +65,16 @@
   [ -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
 
+  if [ ! -z "$DIR" -a ! -d "$DIR" ] ; then
+     echo "Error: specified parameter for -c is not a directory" >&2
+     exit 1
+  fi
+
   shift $(($OPTIND - 1))
 # }}}
 
@@ -65,8 +87,8 @@
 
 # variables {{{
   ORIG_DIR="$(pwd)"
-  # note: grub-pc_1.96+20090603-1_i386.deb seems to be b0rken
-  GRUB_DEB="grub-pc_1.96+20080724-16_i386.deb"
+  # note: grub-pc_1.96+20090603-1 seems to be b0rken
+  GRUB_VERSION="grub-pc_1.96+20080724-16"
 
 # normalise path
   case $ISOFILE in
@@ -76,37 +98,35 @@
 # }}}
 
 # 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"
+  $GRML2USB "${REMOVE_OPTS[@]}" ${ADD_OPTS:+"$ADD_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
-  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
-
-  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
+# move syslinux to isolinux {{{
+  mv "$WRKDIR"/cddir/boot/syslinux "$WRKDIR"/cddir/boot/isolinux
 
-  cat usr/lib/grub/i386-pc/cdboot.img "$WRKDIR"/cddir/boot/grub/core.img \
-    > "$WRKDIR"/cddir/boot/grub/eltorito.img
   cd "$WRKDIR/cddir"
+  echo "menu label ^Isolinux prompt" > boot/isolinux/promptname.cfg
+  echo "include hd.cfg" >> boot/isolinux/grmlmain.cfg
+# }}}
+
+# copy specified directory to cd {{{
+  if [ -n "$DIR" ] ; then
+     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/grub/eltorito.img -c boot/grub/eltorito.cat \
+    -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat \
     -o "$ISOFILE" .
 # }}}
 
@@ -117,23 +137,12 @@
   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"
 # }}}