Changeset 226 in MondoRescue for trunk

Timestamp:

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

Author:

bcornec

Message:

merge -r218:225 $SVN_M/branches/2.05

Location:

trunk

Files:

• mindi/mindi (modified) (1 diff)
• mindi/parted2fdisk.pl (modified) (1 diff)
• mindi/rootfs/bin/busybox-i386.net (modified) ( previous)
• mindi/rootfs/sbin/init (modified) (2 diffs)
• mondo/mondo/common/libmondo-files.c (modified) (1 diff)

trunk/mindi/mindi

@@ -2209 +2209 @@
     if [ -e "$MONDO_HOME/restore-scripts" ] ; then
         cp -Rdf $MONDO_HOME/restore-scripts/* . 2>> $LOGFILE
-        [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MINDI_LIB/restore-scripts"
+        [ "$?" -ne "0" ] && [ "`DidMondoCallMe`" ] && Die "Cannot find/install $MONDO_HOME/restore-scripts"
     fi
     [ -d "/lib/dev-state" ] && cp --parents -pRdf /lib/dev-state .

trunk/mindi/parted2fdisk.pl

@@ -44 +44 @@
     $arch = $ENV{ARCH};
 } else {
-    $arch = `"/bin/arch"`;
+    $arch = `"uname -m"`;
     chomp($arch);
 }

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

trunk/mondo/mondo/common/libmondo-files.c

@@ -1084 +1084 @@
            call_program_and_get_last_line_of_output(command));
     sprintf(command,
-            "route -n | grep '^0.0.0.0' | awk '{printf $2}'");
+            "route -n | grep '^0.0.0.0' | awk '{print $2}'");
     asprintf(&nfs_client_defgw,
            call_program_and_get_last_line_of_output(command));