X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2iso;h=1b2cfec9b2fb3cf3cc171d49bf97b9b9e4390ec4;hp=f1e966f76b18ac0cd96ce5587c8ec737463ca20c;hb=bacf8f325d846be017e5bf27316ef4641fd2399e;hpb=c405c60270992217b4485dbcd0ba4c9bf258fa0b

diff --git a/grml2iso b/grml2iso
index f1e966f..1b2cfec 100755
--- a/grml2iso
+++ b/grml2iso
@@ -67,8 +67,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
@@ -78,37 +78,27 @@
 # }}}
 
 # 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"
 # }}}
 
-# 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
 # }}}
 
 # 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" .
 # }}}
 
@@ -119,23 +109,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"
 # }}}