Changeset 226 in MondoRescue for trunk/mindi/rootfs/sbin/init

Timestamp:

Dec 15, 2005, 2:58:31 PM (19 years ago)

Author:

bcornec

Message:

merge -r218:225 $SVN_M/branches/2.05

File:

• trunk/mindi/rootfs/sbin/init (modified) (2 diffs)

trunk/mindi/rootfs/sbin/init

@@ -638 +638 @@
             done
         fi
-        LogIt "Mounting NFS image $imgname-1.iso on /mnt/cdrom in loopback"
-        losetup /dev/loop7 /tmp/isodir/$imgname-1.iso
+        dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+        if [ "$dirimg" = "" ]; then
+            imgname="/"
+        fi
+        LogIt "Mounting NFS image $imgname-1.iso in $dirimg on /mnt/cdrom in loopback"
+        losetup /dev/loop7 /tmp/isodir/$dirimg/$imgname-1.iso
         mount -t iso9660 /dev/loop7 /mnt/cdrom
         # Simulate a local CD
@@ -678 +682 @@
     cp -af /dev/md2 /dev/md/2 2> /dev/null
 fi
-export ARCH=`/bin/arch`
+export ARCH=`uname -m`
 WelcomeMessage
 # SpaceTests; # Mandrake Linux 8.1 doesn't like this