X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=2c4c1b221b7ffdf889abfec46c1a95147688641c;hp=cc086ef3c98e59f9422f04b55e7a96db748b8e7f;hb=05fb6c5715c60f11f257df61779a351c8eb4c947;hpb=9e7a9aab67b0ba89094a04d4642b449e0af01cd4

diff --git a/grml2usb b/grml2usb
index cc086ef..2c4c1b2 100755
--- a/grml2usb
+++ b/grml2usb
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Fre Jun 08 18:06:54 CEST 2007 [mika]
+# Latest change: Sam Jän 19 16:57:39 CET 2008 [mika]
 ################################################################################
 
 # colors {{{
@@ -49,7 +49,7 @@
   LANGUAGE='C'
   LC_ALL='C'
   PROGRAMNAME=${0##*/}
-  VERSION='0.7.6'
+  VERSION='0.8.0'
   ISO="$1"
   DEVICE="$2"
 
@@ -81,7 +81,7 @@ Usage:
           /mount/point should not be mounted at the time running $PROGRAMNAME
 
 Usage example - install grml-small to usb-device on /mnt/external1:
-  $PROGRAMNAME grml_small_0.2.iso /mnt/external1
+  $PROGRAMNAME grml_small_0.4.iso /mnt/external1
 
 Usage example - install currently running grml to usb-device on /mnt/external1:
   $PROGRAMNAME /cdrom /mnt/external1
@@ -184,9 +184,18 @@ copyit(){
        cp ${DEVICE}/boot/isolinux/isolinux.cfg ${DEVICE}/boot/isolinux/syslinux.cfg && \
        echo 'syslinux.cfg' >> $DEVICE/grml2usb.filelist
     fi
-    mv    ${DEVICE}/boot/isolinux/* ${DEVICE}/    && \
-    rmdir ${DEVICE}/boot/isolinux                 && \
-    rmdir ${DEVICE}/boot/
+
+    if mv ${DEVICE}/boot/isolinux/* ${DEVICE}/ ; then
+       rmdir ${DEVICE}/boot/isolinux
+    fi
+
+    if [ -d "${DEVICE}"/boot/grub ] ; then
+       [ -d "${DEVICE}/grub" ] || mkdir ${DEVICE}/grub
+       mv ${DEVICE}/boot/grub/* ${DEVICE}/grub/
+    fi
+
+    rmdir ${DEVICE}/boot 2>/dev/null
+
     sync && echo "${WHITE}done${NORMAL}"
   else
     unmount
@@ -200,8 +209,13 @@ run_syslinux(){
   SYSDEV=$(echo ${TMPDEV%/})
   echo -n "Running syslinux on ${SYSDEV}: "
   debugit "debug: syslinux ${SYSDEV}"
-  syslinux ${SYSDEV} && echo "${WHITE}done${NORMAL}" || echo 1>&2 "${RED}Problem when running syslinux?
+  if syslinux ${SYSDEV} ; then
+     echo "${WHITE}done${NORMAL}"
+  else
+     echo 1>&2 "${RED}Problem when running syslinux?
 Try to call it manually via "syslinux $SYSDEV" if you installed grml to $SYSDEV'${NORMAL}"
+     return 1
+  fi
 }
 
 # }}}