Changeset 801 in MondoRescue

Timestamp:

Sep 22, 2006, 1:06:49 AM (18 years ago)

Author:

Bruno Cornec

Message:

Should fix bug #21 by exporting variables from start-nfs and overriding values in mondo-rstr-tools.c with thee exports

Location:

branches/stable

Files:

• mindi/rootfs/sbin/start-nfs (modified) (4 diffs)
• mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

branches/stable/mindi/rootfs/sbin/start-nfs

@@ -3 +3 @@
 # $Id$
 #
-# This script set up the network + NFS environement if needed.
+# This script setup the network + NFS environment if needed.
 #
 
@@ -17 +17 @@
 ipgateway=`grep nfs-client-defgw /tmp/mondo-restore.cfg | cut -d' ' -f2-`
 ipconf=""
-nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg | cut -d' ' -f2-`
-imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+export nfsmount=`grep nfs-server-mount /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+export imgname=`grep iso-prefix /tmp/mondo-restore.cfg | cut -d' ' -f2-`
 if [ "$imgname" = "" ]; then
-    imgname="mondorescue"
+    export imgname="mondorescue"
 fi
-dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
+export dirimg=`grep nfs-server-path /tmp/mondo-restore.cfg | cut -d' ' -f2-`
 if [ "$dirimg" = "" ]; then
-    dirimg="/"
+    export dirimg="/"
 fi
 
@@ -31 +31 @@
     echo $i | grep -qi ping= && ipcount=`echo $i | cut -d= -f2`
     echo $i | grep -qi ipconf= && ipconf=`echo $i | cut -d= -f2`
-    echo $i | grep -qi nfsmount= && nfsmount=`echo $i | cut -d= -f2`
-    echo $i | grep -qi prefix= && imgname=`echo $i | cut -d= -f2`
+    echo $i | grep -qi nfsmount= && export nfsmount=`echo $i | cut -d= -f2`
+    echo $i | grep -qi prefix= && export imgname=`echo $i | cut -d= -f2`
 done
 
@@ -73 +73 @@
 mount -t nfs -o nolock $nfsmount /tmp/isodir
 
-LogIt "Mounting NFS image $imgname-1.iso in $dirimg on /mnt/cdrom in loopback"
-losetup /dev/loop7 /tmp/isodir/$dirimg/$imgname-1.iso
+LogIt "Mounting NFS image ${imgname}-1.iso in $dirimg on /mnt/cdrom in loopback"
+losetup /dev/loop7 /tmp/isodir/$dirimg/${imgname}-1.iso
 mount -o ro -t iso9660 /dev/loop7 /mnt/cdrom

branches/stable/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -1044 +1044 @@
                     strcpy(bkpinfo->prefix,STD_PREFIX);
             }
+            /* We need to override prefix value in PXE mode as it's 
+             * already done in start-nfs */
+            if (strstr(call_program_and_get_last_line_of_output
+               ("cat /proc/cmdline"), "pxe")) {
+                    strcpy(bkpinfo->prefix,getenv("imgname"));
+            }
+
         } else if (!strcmp(value, "tape")) {
             bkpinfo->backup_media_type = tape;
@@ -1151 +1158 @@
             log_msg(2, "nfs_remote_dir is %s", bkpinfo->nfs_remote_dir);
         }
+        /* We need to override values in PXE mode as it's 
+         * already done in start-nfs */
+        if (strstr(call_program_and_get_last_line_of_output
+           ("cat /proc/cmdline"), "pxe")) {
+                strcpy(bkpinfo->nfs_mount,getenv("nfsmount"));
+                strcpy(bkpinfo->nfs_remote_dir,getenv("dirimg"));
+            }
     } else if (bkpinfo->backup_media_type == iso) {
         /* Patch by Conor Daly 23-june-2004 
@@ -1202 +1216 @@
                     } else {
                         log_msg(1,
-                                "You backed up to disk, then burned some CDs. Naughty monkey!");
+                                "You backed up to disk, then burned some CDs.");
                     }
                 }