Changeset 1564 in MondoRescue

Timestamp:

Jul 25, 2007, 11:04:05 AM (18 years ago)

Author:

Bruno Cornec

Message:

Improve ia64 support for SLES

(merge -r1562:1563 $SVN_M/branches/2.2.5)

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• restore-scripts/mondo/stabelilo-me (modified) (3 diffs)

branches/stable/mondo/src/common/libmondo-archive.c

@@ -734 +734 @@
     } else if (bkpinfo->boot_loader == 'E') {
         strcpy(bootldr_str, "ELILO");
-        /* BERLIOS: fix it for SuSE, Debian, Mandrake, ... */
+        /* BERLIOS: fix it for Debian, Mandrake, ... */
         if (!does_file_exist("/etc/elilo.conf")
             && does_file_exist("/boot/efi/efi/redhat/elilo.conf")) {
             run_program_and_log_output
                 ("ln -sf /boot/efi/efi/redhat/elilo.conf /etc/elilo.conf",
+                 5);
+        }
+        if (!does_file_exist("/etc/elilo.conf")
+            && does_file_exist("/boot/efi/efi/SuSE/elilo.conf")) {
+            run_program_and_log_output
+                ("ln -sf /boot/efi/efi/SuSE/elilo.conf /etc/elilo.conf",
                  5);
         }

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

@@ -20 +20 @@
 
 
+LocateOldElilo() {
+    old_eliloconf=""
+    if [ -f "/mnt/RESTORING/boot/efi/efi/redhat/elilo.conf" ] ; then
+        LogIt "elilo.conf found at /mnt/RESTORING/boot/efi/efi/redhat/elilo.conf" 2
+        old_eliloconf="/mnt/RESTORING/boot/efi/efi/redhat/elilo.conf"
+        return 0
+    elif [ -f "/mnt/RESTORING/boot/efi/efi/SuSE/elilo.conf" ] ; then
+        LogIt "elilo.conf found at /mnt/RESTORING/boot/efi/efi/SuSE/elilo.conf" 2
+        old_eliloconf="/mnt/RESTORING/boot/efi/efi/SuSE/elilo.conf"
+        return 0
+    else
+        LogIt "Looking for elilo.conf. Please wait." 2
+        elilo_list=`find /mnt/RESTORING/boot -name elilo.conf 2> /dev/null`
+    fi
+    where_they_live=""
+    for curr_elilo in $elilo_list ; do
+        curr_dir=`dirname $curr_elilo`
+        if [ "$?" -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 elilo.conf" 1
+        return 1
+    fi
+    old_eliloconf=$where_they_live/elilo.conf
+    LogIt "ELILO found." 2
+    return 0
+}
+
 LocateOldFstab() {
     old_fstab=""
-    old_eliloconf=""
     if [ -f "/mnt/RESTORING/etc/fstab" ] ; then
         LogIt "No need for fstab search." 2
-#        fstab_list=/mnt/RESTORING/etc/fstab
-    old_fstab=/mnt/RESTORING/etc/fstab
-    old_eliloconf=/mnt/RESTORING/boot/efi/efi/redhat/elilo.conf
-    return 0
+        old_fstab=/mnt/RESTORING/etc/fstab
+        return 0
     elif [ -f "/mnt/cdrom/archives/CUCKOO" ] ; then
         LogIt "Because I'm cuckoo, I'll stop searching." 2
@@ -38 +70 @@
     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
-    ### Will NOT work for ELILO
-    ###old_eliloconf=$where_they_live/elilo.conf
-    old_eliloconf=/boot/efi/efi/redhat/elilo.conf
     old_fstab=$where_they_live/fstab
-    LogIt "LILO and fstab found." 2
+    LogIt "fstab found." 2
     return 0
 }
-
 
 
@@ -96 +124 @@
 LogIt "stabelilo-me --- starting"
 LocateOldFstab
+LocateOldElilo
 old_mountlist=/tmp/mountlist.original
 new_mountlist=/tmp/mountlist.txt