Changeset 853 in MondoRescue for branches/stable

Timestamp:

Sep 28, 2006, 5:34:10 PM (18 years ago)

Author:

Bruno Cornec

Message:

Patches from Brendan Bouffler <brendan.bouffler_at_hp.com> to allow x86_64 to work.

Location:

branches/stable/mindi

Files:

• deplist.txt (modified) (1 diff)
• mindi (modified) (5 diffs)
• rootfs/etc/ld.so.conf (modified) (1 diff)
• rootfs/sbin/init (modified) (1 diff)

branches/stable/mindi/deplist.txt

@@ -34 +34 @@
 eject
 grep ld-linux.so.2 ld-2.3.4.so
+ldconfig
 hosts host.conf resolv.conf hosts.allow hosts.deny
 wc

branches/stable/mindi/mindi

@@ -1370 +1370 @@
             redhat_label=`echo "$current_partition" | /bin/cut -d'=' -f2`
             actual_dev=""
+
+            # 1st try, findfs - the RHEL way of finding labels and their partitions
+            if [ -x "/sbin/findfs" ]; then
+                actual_dev=`/sbin/findfs LABEL=${redhat_label}`
+            fi
     
-            # 1st try : blkid, the good way for all LABEL except swap
-            if [ -x "/sbin/blkid" ]; then
+            # 2nd try : blkid, the good way for all LABEL except swap
+            if [ "x$actual_dev" = "x" -a -x "/sbin/blkid" ]; then
                 actual_dev=`/sbin/blkid | /bin/grep "$redhat_label" | grep LABEL= | /bin/cut -d':' -f1`
                 # For LVM FS it will give a /dev/dm-# which should then be converted
@@ -1389 +1394 @@
             fi
     
-            # 2nd try, which works on a standard partition (ext2/3), but not on swap
+            # 3rd try, which works on a standard partition (ext2/3), but not on swap
             # For LVM gives a /dev/mapper entry 
             if [ "x$actual_dev" = "x" ]; then
@@ -1395 +1400 @@
             fi
     
-            # 3rd try, with vol_id 
+            # 4th try, with vol_id 
             # SWAP only
             if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
@@ -1408 +1413 @@
             fi
 
-            # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice or SW-mydevice. e.g. : LABEL=SWAP-hda5
+            # 5th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice or SW-mydevice. e.g. : LABEL=SWAP-hda5
             # LABEL=SW-cciss/c0d0p3 (RDP)
+            # or could be a string that isn't a complete device name (eg. LABEL =SWAP-cciss/c0d0p)
             # SWAP only
             if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | /bin/grep -iE 'LABEL=SWAP|LABEL=SW-'`" != _"" ]; then
-                try_dev="`echo "$redhat_label" | /bin/cut -d '-' -f2`"
-                present_dev="`/bin/cat /proc/swaps | /bin/grep -w /dev/$try_dev`"
-                if [ "x$present_dev" != "x" ] ; then
-                    actual_dev="/dev/$try_dev"
-                fi
+                    for try_dev in `tail +2 /proc/swaps | cut -d' ' -f1`
+                    do
+                        # Location of the swap label for kernel 2.6
+                        try_dev_label=`dd bs=1 count=16 skip=1052 if=$try_dev 2> /dev/null`
+                        if [ "x$try_dev_label" = "x$redhat_label" ]; then
+                            echo "$swdev is $label"
+                        fi
+                    done
             fi
 
@@ -1423 +1432 @@
                 current_partition=$actual_dev
             else
-                Die "Your system uses a labelled partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in /etc/fstab or install blkid|vol_id\n"
+                    Die "Your system uses a labelled partition ($current_partition), but you lack the tool to support it.\nPlease replace labels with their correct devices in /etc/fstab or install findfs|blkid|vol_id\n"
             fi
         else

branches/stable/mindi/rootfs/etc/ld.so.conf

@@ -12 +12 @@
 /usr/emu/lib
 /usr/jvm/lib
+/lib64
+/usr/lib64
+/usr/local/lib64
+/usr/X11R6/lib64

branches/stable/mindi/rootfs/sbin/init

@@ -481 +481 @@
 res=$?
 SwapTheMountExecs
+ldconfig
 ConfigureLoggingDaemons
 if [ -e "/tmp/USE-DEVFS" ] ; then