Ignore:
Timestamp:
Dec 15, 2005, 2:58:31 PM (13 years ago)
Author:
bcornec
Message:

merge -r218:225 $SVN_M/branches/2.05

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/rootfs/sbin/init

    r219 r226  
    638638            done
    639639        fi
    640         LogIt "Mounting NFS image $imgname-1.iso on /mnt/cdrom in loopback"
    641         losetup /dev/loop7 /tmp/isodir/$imgname-1.iso
     640        dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
     641        if [ "$dirimg" = "" ]; then
     642            imgname="/"
     643        fi
     644        LogIt "Mounting NFS image $imgname-1.iso in $dirimg on /mnt/cdrom in loopback"
     645        losetup /dev/loop7 /tmp/isodir/$dirimg/$imgname-1.iso
    642646        mount -t iso9660 /dev/loop7 /mnt/cdrom
    643647        # Simulate a local CD
     
    678682    cp -af /dev/md2 /dev/md/2 2> /dev/null
    679683fi
    680 export ARCH=`/bin/arch`
     684export ARCH=`uname -m`
    681685WelcomeMessage
    682686# SpaceTests; # Mandrake Linux 8.1 doesn't like this
Note: See TracChangeset for help on using the changeset viewer.