X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=remaster%2Fgrml-live-remaster;h=456dbab2f557e3f7283061d4e6981715067c1129;hp=ba5f749f702182fa17e9f80c1485076741986498;hb=b63a5f16ac3f03eb93220fd26ab188e50314f5d0;hpb=2def18e419f1474c3904672ce297babbb4b9b501

diff --git a/remaster/grml-live-remaster b/remaster/grml-live-remaster
index ba5f749..456dbab 100755
--- a/remaster/grml-live-remaster
+++ b/remaster/grml-live-remaster
@@ -1,7 +1,10 @@
 #!/bin/sh
 # Filename:      grml-live-remaster
 # Purpose:       remaster a grml from the live cd
-# Authors:       grml-team (grml.org), (c) Michael Schierl <schierlm@gmx.de>, (c) Michael Prokop <mika@grml.org>
+# Authors:       grml-team (grml.org),
+#                (c) Michael Schierl <schierlm@gmx.de>,
+#                (c) Michael Prokop <mika@grml.org>,
+#                (c) Thorsten Glaser <tg@mirbsd.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
@@ -9,9 +12,17 @@
 # this script currently lacks LOTS of error checking code... any help welcome...
 ################################################################################
 
+# define function getfilesize before "set -e"
+if stat --help >/dev/null 2>&1; then
+  getfilesize='stat -c %s'      # GNU stat
+else
+  getfilesize='stat -f %z'      # BSD stat
+fi
+
 set -e # exit on any error
 
 VERSION='0.0.2'
+GRML_LIVE_EDITOR=${VISUAL:-${EDITOR:-vi}}
 
 # source core functions {{{
 . /etc/grml/lsb-functions
@@ -19,7 +30,19 @@ VERSION='0.0.2'
 # }}}
 
 # make sure we have what we need {{{
-check4progs mkisofs mksquashfs || exit 1
+check4progs mkisofs stat || exit 1
+
+# allow overriding via environment:
+if [ -z "$MKSQUASHFS" ] ; then
+  if which mksquashfs-lzma >/dev/null 2>&1 ; then
+    MKSQUASHFS=mksquashfs-lzma
+  elif which mksquashfs >/dev/null 2>&1 ; then
+    MKSQUASHFS=mksquashfs
+  else
+    echo "Error: neither mksquashfs-lzma nor mksquashfs present. Exiting."
+    exit 1
+  fi
+fi
 check4root || exit 1
 # }}}
 
@@ -32,7 +55,7 @@ if [ x"$1" == x ]; then
    echo "  first, because grml-live-remaster will need a lot ot RAM."
    echo ""
    echo "Please report bugs and feature requests: http://grml.org/bugs/"
-   exit -1
+   exit 1
 fi
 
 if [ ! -d /remaster ]; then
@@ -68,7 +91,7 @@ for i in dev proc root sys tmp; do
         umount /remaster/chroot/$i
 done
 
-$EDITOR /remaster/msg
+${GRML_LIVE_EDITOR} /remaster/msg
 
 [ -d /remaster/iso ] || mkdir /remaster/iso
 
@@ -96,7 +119,7 @@ sed 3,4d "${BOOTSTUFF}"/boot.msg \
 sed 1,2d /remaster/msg >>/remaster/iso/boot/isolinux/boot.msg
 
 mkdir /remaster/iso/live
-mksquashfs /remaster/chroot /remaster/iso/live/"$(basename $SQUASHFS_FILE)"
+$MKSQUASHFS /remaster/chroot /remaster/iso/live/"$(basename $SQUASHFS_FILE)"
 umount /remaster/chroot /remaster/cdrom
 
 if [ -f /remaster/iso/boot/isolinux/isolinux.bin ] ; then
@@ -108,9 +131,17 @@ else
 fi
 
 mkisofs -b $ISOLINUX -no-emul-boot -c $ISOLINUX_BOOTCAT \
-        -boot-info-table -l -r -J -o "$1" /remaster/iso
+        -boot-info-table -boot-load-size 4 -no-pad \
+        -l -r -J -o "$1" /remaster/iso
+# pad for partition table
+siz=$($getfilesize "$1")
+cyls=$((siz / 512 / 32 / 16 + 1))       # C=$cyls H=16 S=32 (= 256 KiB units)
+siz=$((cyls * 16 * 32 * 512))           # size after padding
+dd if=/dev/zero bs=1 count=1 seek=$((siz - 1)) of="$1" 2>/dev/null
 rm -R /remaster/iso
 
+# here is the place where we could apply bootgrub.mksh
+
 echo ""
 echo "ISO generation complete:"
 ls --color -l "$1"