Changeset 1449 in MondoRescue

Timestamp:

May 18, 2007, 2:53:05 AM (17 years ago)

Author:

Bruno Cornec

Message:

Fix #159 (pb with readlink and grub.conf)

File:

• branches/stable/mondo/src/restore-scripts/mondo/stabgrub-me (modified) (7 diffs)

branches/stable/mondo/src/restore-scripts/mondo/stabgrub-me

@@ -8 +8 @@
 QuitIfNotFound() {
     if [ ! -f "$1" ] ; then
-    LogIt "(stabgrub-me) Where's $1? I cannot continue." 1
-    exit 1
+        LogIt "(stabgrub-me) Where's $1? I cannot continue." 1
+        exit 1
     fi
 }
@@ -29 +29 @@
         # we run this outside the chroot.
         if [ -L "$old_grubconf" ] ; then
-            old_grubconf=/mnt/RESTORING/etc/`readlink "$old_grubconf"`
+            l=`readlink "$old_grubconf"`
+            if [ _"`echo $l | cut -c1`" = _"/" ]; then
+                # If readlink gives an absolute path it's related to the chroot
+                old_grubconf=/mnt/RESTORING/$l
+            else
+                # If readlink gives a relative path, it's in the same dir
+                old_grubconf=/mnt/RESTORING/etc/$l
+            fi
         fi  
         return 0
@@ -41 +48 @@
     where_they_live=""
     for curr_fstab in $fstab_list ; do
-    curr_dir=`echo $curr_fstab | gawk '{i=index($0,"/fstab");print substr($0,0,i-1);}'`
-    resA=$?
-    curr_inetd=`find $curr_dir -name inetd.conf | grep -v "linuxconf"`
-    resB=$?
-    if [ "$resA" -eq "0" ] ; then
-        if [ "$where_they_live" != "" ] ; then
-        LogIt "Two directories found! One is $where_they_live, the other $curr_dir" 1
-        LogIt "I don't know which to choose. I'll abort the search." 1
-        return 1
-        fi
-        where_they_live=$curr_dir
-    fi
+        curr_dir=`echo $curr_fstab | gawk '{i=index($0,"/fstab");print substr($0,0,i-1);}'`
+        resA=$?
+        curr_inetd=`find $curr_dir -name inetd.conf | grep -v "linuxconf"`
+        resB=$?
+        if [ "$resA" -eq "0" ] ; then
+            if [ "$where_they_live" != "" ] ; then
+                LogIt "Two directories found! One is $where_they_live, the other $curr_dir" 1
+                LogIt "I don't know which to choose. I'll abort the search." 1
+                return 1
+            fi
+            where_they_live=$curr_dir
+        fi
     done
     if [ "$where_they_live" = "" ] ; then
-    LogIt "Cannot find any folder which holds fstab _and_ inetd.conf" 1
-    return 1
+        LogIt "Cannot find any folder which holds fstab _and_ inetd.conf" 1
+        return 1
     fi
     old_grubconf=$where_they_live/grub.conf
@@ -71 +78 @@
     LogIt "Backing up original files before modifying them..." 2
     for i in $old_grubconf $old_fstab ; do
-    LogIt "Backing up $i"
+        LogIt "Backing up $i"
         [ -e "$i" ] && [ ! -e "$i.$BEFORE" ] && cp -f $i $i.$BEFORE
     done
@@ -82 +89 @@
     cp -f $old_fstab /tmp/fstab.ugly
     for i in $old_grubconf $old_fstab ; do
-    LogIt "Restoring $i"
-    [ -f "$i.$BEFORE" ] && cp -f $i.$BEFORE $i
+        LogIt "Restoring $i"
+        [ -f "$i.$BEFORE" ] && cp -f $i.$BEFORE $i
     done
 }
@@ -145 +152 @@
     fi
     if [ "$outval" -ne "0" ] ; then
-    LogIt "Modifications (copying) failed. Restoring from backups." 3
-    RestoreBackups
+        LogIt "Modifications (copying) failed. Restoring from backups." 3
+        RestoreBackups
     else
-    LogIt "Fstab modified ok." 2
+        LogIt "Fstab modified ok." 2
     fi
     cd /mnt/RESTORING
@@ -159 +166 @@
     if [ "$grub_res" -ne "0" ] ; then
         LogIt "grub-install failed. Running grub-MR..."
-    chroot /mnt/RESTORING grub-install '(hd0)' >> $LOGFILE 2>> $LOGFILE
+        chroot /mnt/RESTORING grub-install '(hd0)' >> $LOGFILE 2>> $LOGFILE
         grub_res=$?
     fi