Changeset 853


Ignore:
Timestamp:
Sep 28, 2006, 5:34:10 PM (13 years ago)
Author:
bruno
Message:

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

Location:
branches/stable/mindi
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi/deplist.txt

    r541 r853  
    3434eject
    3535grep ld-linux.so.2 ld-2.3.4.so
     36ldconfig
    3637hosts host.conf resolv.conf hosts.allow hosts.deny
    3738wc
  • branches/stable/mindi/mindi

    r834 r853  
    13701370            redhat_label=`echo "$current_partition" | /bin/cut -d'=' -f2`
    13711371            actual_dev=""
     1372
     1373            # 1st try, findfs - the RHEL way of finding labels and their partitions
     1374            if [ -x "/sbin/findfs" ]; then
     1375                actual_dev=`/sbin/findfs LABEL=${redhat_label}`
     1376            fi
    13721377   
    1373             # 1st try : blkid, the good way for all LABEL except swap
    1374             if [ -x "/sbin/blkid" ]; then
     1378            # 2nd try : blkid, the good way for all LABEL except swap
     1379            if [ "x$actual_dev" = "x" -a -x "/sbin/blkid" ]; then
    13751380                actual_dev=`/sbin/blkid | /bin/grep "$redhat_label" | grep LABEL= | /bin/cut -d':' -f1`
    13761381                # For LVM FS it will give a /dev/dm-# which should then be converted
     
    13891394            fi
    13901395   
    1391             # 2nd try, which works on a standard partition (ext2/3), but not on swap
     1396            # 3rd try, which works on a standard partition (ext2/3), but not on swap
    13921397            # For LVM gives a /dev/mapper entry
    13931398            if [ "x$actual_dev" = "x" ]; then
     
    13951400            fi
    13961401   
    1397             # 3rd try, with vol_id
     1402            # 4th try, with vol_id
    13981403            # SWAP only
    13991404            if [ "x$actual_dev" = "x" -a -x "/sbin/vol_id" ]; then
     
    14081413            fi
    14091414
    1410             # 4th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice or SW-mydevice. e.g. : LABEL=SWAP-hda5
     1415            # 5th try : pre-formated LABEL. Format is : LABEL=SWAP-mydevice or SW-mydevice. e.g. : LABEL=SWAP-hda5
    14111416            # LABEL=SW-cciss/c0d0p3 (RDP)
     1417            # or could be a string that isn't a complete device name (eg. LABEL =SWAP-cciss/c0d0p)
    14121418            # SWAP only
    14131419            if [ "x$actual_dev" = "x" -a  _"`echo $current_partition | /bin/grep -iE 'LABEL=SWAP|LABEL=SW-'`" != _"" ]; then
    1414                 try_dev="`echo "$redhat_label" | /bin/cut -d '-' -f2`"
    1415                 present_dev="`/bin/cat /proc/swaps | /bin/grep -w /dev/$try_dev`"
    1416                 if [ "x$present_dev" != "x" ] ; then
    1417                     actual_dev="/dev/$try_dev"
    1418                 fi
     1420                    for try_dev in `tail +2 /proc/swaps | cut -d' ' -f1`
     1421                    do
     1422                        # Location of the swap label for kernel 2.6
     1423                        try_dev_label=`dd bs=1 count=16 skip=1052 if=$try_dev 2> /dev/null`
     1424                        if [ "x$try_dev_label" = "x$redhat_label" ]; then
     1425                            echo "$swdev is $label"
     1426                        fi
     1427                    done
    14191428            fi
    14201429
     
    14231432                current_partition=$actual_dev
    14241433            else
    1425                 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"
     1434                    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"
    14261435            fi
    14271436        else
  • branches/stable/mindi/rootfs/etc/ld.so.conf

    r30 r853  
    1212/usr/emu/lib
    1313/usr/jvm/lib
     14/lib64
     15/usr/lib64
     16/usr/local/lib64
     17/usr/X11R6/lib64
  • branches/stable/mindi/rootfs/sbin/init

    r746 r853  
    481481res=$?
    482482SwapTheMountExecs
     483ldconfig
    483484ConfigureLoggingDaemons
    484485if [ -e "/tmp/USE-DEVFS" ] ; then
Note: See TracChangeset for help on using the changeset viewer.