X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=remaster%2Fgrml-live-remaster;h=f922f5aa56714a4e042964889c419d49fb129efa;hp=d4970a6cde8190df5278a2601e0380d7b781ae30;hb=7bd13c06b566d4cce521dfc005b0a5a74a08377e;hpb=7419019f1ed1f386e8ac723604f100928d66d388

diff --git a/remaster/grml-live-remaster b/remaster/grml-live-remaster
index d4970a6..f922f5a 100755
--- a/remaster/grml-live-remaster
+++ b/remaster/grml-live-remaster
@@ -21,6 +21,14 @@ fi
 
 set -e # exit on any error
 
+if [ -d /live/image/boot/ ] ; then # until Grml versions <=2012.XX
+  LIVE_PATH_MAIN='/live/image'
+  LIVE_PATH_BOOT='/live/image/boot/'
+else # for Grml versions >=2013.XX
+  LIVE_PATH_MAIN='/lib/live/mount/medium/'
+  LIVE_PATH_BOOT='/lib/live/mount/medium/boot/'
+fi
+
 VERSION='0.0.3'
 GRML_LIVE_EDITOR=${VISUAL:-${EDITOR:-vi}}
 
@@ -58,27 +66,25 @@ check4progs 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
+  if which mksquashfs >/dev/null 2>&1 ; then
     MKSQUASHFS=mksquashfs
   else
-    echo "Error: neither mksquashfs-lzma nor mksquashfs present. Exiting."
+    echo "Error: mksquashfs is not available. Exiting." >&2
     exit 1
   fi
 fi
 check4root || exit 1
 # }}}
 
-if [ x"$1" == x ]; then
-   echo "$0 - version $VERSION"
-   echo ""
-   echo "Usage: $0 destination.iso"
-   echo "  destination.iso should point to a path that is on a hard disk,"
-   echo "  you might want to mount some swap partitions or swap files"
-   echo "  first, because grml-live-remaster will need a lot ot RAM."
-   echo ""
-   echo "Please report bugs and feature requests: http://grml.org/bugs/"
+if [ -z "$1" ]; then
+   echo "$0 - version $VERSION
+
+Usage: $0 destination.iso
+  destination.iso should point to a path that is on a hard disk,
+  you might want to mount some swap partitions or swap files
+  first, because grml-live-remaster will need a lot ot RAM.
+
+Please report bugs and feature requests: http://grml.org/bugs/" >&2
    exit 1
 fi
 
@@ -88,14 +94,12 @@ if [ ! -d /remaster ]; then
    echo "#:# edit the following two lines to change the boot message" \
            >/remaster/msg
    echo "#:#" >>/remaster/msg
-   if [ -r /live/image/boot/isolinux/boot.msg ] ; then
-      sed 1,2d /live/image/boot/isolinux/boot.msg >>/remaster/msg
-   else
-      sed 1,2d /live/image/boot.msg >>/remaster/msg
+   if [ -r ${LIVE_PATH_BOOT}/isolinux/boot.msg ] ; then
+     sed 1,2d ${LIVE_PATH_BOOT}/isolinux/boot.msg >>/remaster/msg
    fi
 fi
 
-SQUASHFS_FILE="$(find /live/image/live -name \*.squashfs | head -1)"
+SQUASHFS_FILE="$(find ${LIVE_PATH_MAIN}/live -name \*.squashfs | head -1)"
 if ! grep -q "/remaster/cdrom squashfs" /proc/mounts ;  then
    mount -t squashfs "$SQUASHFS_FILE" /remaster/cdrom -o ro,loop
 fi
@@ -119,8 +123,8 @@ ${GRML_LIVE_EDITOR} /remaster/msg
 
 [ -d /remaster/iso ] || mkdir /remaster/iso
 
-for i in /live/image/*; do
-    if [ ! $i == /live/image/live ]; then
+for i in ${LIVE_PATH_MAIN}/*; do
+    if [ ! $i = ${LIVE_PATH_MAIN}/live ]; then
        cp -R $i /remaster/iso
     fi
 done
@@ -130,10 +134,10 @@ if [ -r /remaster/iso/boot/isolinux/boot.msg ] ; then
 fi
 
 # make sure we support usb sticks as well:
-if [ -d /live/image/boot/isolinux ] ; then
-   BOOTSTUFF=/live/image/boot/isolinux
+if [ -d ${LIVE_PATH_BOOT}/isolinux ] ; then
+   BOOTSTUFF=${LIVE_PATH_BOOT}/isolinux
 else
-   BOOTSTUFF=/live/image
+   BOOTSTUFF=${LIVE_PATH_MAIN}
 fi
 
 [ -d /remaster/iso/boot/isolinux ] || mkdir -p /remaster/iso/boot/isolinux