Fix the grub issue

diff --git a/debian/changelog b/debian/changelog
index c13b965..dcc79ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml2usb (0.8.0) unstable; urgency=low
+
+  * Fix the "mv: cannot move `/mnt/usb-sdb1/boot/grub' to a subdirectory of
+    itself, `/mnt/usb-sdb1/grub'" issue.
+
+ -- Michael Prokop <mika@grml.org>  Sat, 19 Jan 2008 16:57:08 +0100
+
 grml2usb (0.7.8) unstable; urgency=low
 
   * Adjust grml2usb for a present grub directory.

diff --git a/grml2usb b/grml2usb
index 3153a72..2c4c1b2 100755 (executable)
--- 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 Nov 16 08:29:17 CET 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.8'
+  VERSION='0.8.0'
   ISO="$1"
   DEVICE="$2"
 
@@ -189,8 +189,9 @@ copyit(){
        rmdir ${DEVICE}/boot/isolinux
     fi
 
-    if [ -d ${DEIVCE}/boot/grub ] ; then
-       mv ${DEVICE}/boot/grub ${DEVICE}
+    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