Changeset 1043 in MondoRescue for trunk/mondo/src/restore-scripts

Timestamp:

Jan 8, 2007, 11:31:22 PM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r978:1042 $SVN_M/branches/stable

Location:

trunk/mondo/src/restore-scripts/mondo

Files:

• hack-fstab (modified) (3 diffs)
• restore-bigfiles-from-iso (modified) (1 diff)
• stabgrub-me (modified) (1 diff)

trunk/mondo/src/restore-scripts/mondo/hack-fstab

@@ -1 +1 @@
 #!/bin/sh
 #
+# $Id$
 #
-#
-#
-#
-# 2003/08/04
-# - added some logging
-#
-# mid-2002 --- created
-################################################
-
 
 LogIt() {
     echo "$1" >> /dev/stderr
 }
-
-
 
 
@@ -33 +23 @@
 #    echo "original_fstab_line = $original_fstab_line" >> /dev/stderr
     if [ "`grep "LABEL=" $old_fstab`" != "" ] ; then
-    if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
-        device="LABEL=$mountpoint"
-    fi
+        if [ "$format" = "ext2" ] || [ "$format" = "ext3" ] ; then
+            device="LABEL=$mountpoint"
+        fi
     fi
 
@@ -44 +34 @@
     if [ "$original_fstab_line" != "" ] ; then
 #   echo $original_fstab_line | gawk '{i=index($0,$4); print substr($0,i);}'
-    echo "$original_fstab_line" | cut -d' ' -f4-19 | tr -s ' ' ' '
+        echo "$original_fstab_line" | cut -d' ' -f4-19 | tr -s ' ' ' '
     else
-    echo -e "defaults 0 0"
+        echo -e "defaults 0 0"
     fi
 }
-
 
 

trunk/mondo/src/restore-scripts/mondo/restore-bigfiles-from-iso

@@ -63 +63 @@
             if echo "$slicename" | grep "bz2" > /dev/null ; then
                 bzip2 -dc $slicename >> "$OUTFNAME" || Die "Failed to decompress slice $slicename"
+            elif echo "$slicename" | grep "gz" > /dev/null ; then
+                gzip -dc $slicename >> "$OUTFNAME" || Die "Failed to decompress slice $slicename"
             elif echo "$slicename" | grep "lzo" > /dev/null ; then
                 lzop -dc $slicename >> "$OUTFNAME" || Die "Failed to decompress slice $slicename"

trunk/mondo/src/restore-scripts/mondo/stabgrub-me

@@ -32 +32 @@
         LogIt "No need for fstab search." 2
 #        fstab_list=/mnt/RESTORING/etc/fstab
-    old_fstab=/mnt/RESTORING/etc/fstab
-    old_grubconf=/mnt/RESTORING/etc/grub.conf
+        old_fstab=/mnt/RESTORING/etc/fstab
+        old_grubconf=/mnt/RESTORING/etc/grub.conf
         # For some distros, e.g. Debian, /etc/grub.conf is a symbolic link
-    # which we need to resolve and prepend with /mnt/RESTORING because
-    # we run this outside the chroot.
-    if [ -L "$old_grubconf" ] ; then
-        old_grubconf=/mnt/RESTORING`readlink "$old_grubconf"`
-    fi  
-    return 0
+        # which we need to resolve and prepend with /mnt/RESTORING because
+        # we run this outside the chroot.
+        if [ -L "$old_grubconf" ] ; then
+            old_grubconf=/mnt/RESTORING/etc/`readlink "$old_grubconf"`
+        fi  
+        return 0
     elif [ -f "/mnt/cdrom/archives/CUCKOO" ] ; then
         LogIt "Because I'm cuckoo, I'll stop searching." 2