Changeset 903 in MondoRescue for trunk/mondo

Timestamp:

Oct 25, 2006, 1:49:52 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r862:888 $SVN_M/branches/stable

Location:

trunk/mondo

Files:

• ChangeLog (modified) (3 diffs)
• src/common/libmondo-devices.c (modified) (1 diff)
• src/common/libmondo-files.c (modified) (1 diff)
• src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)

trunk/mondo/ChangeLog

@@ -8 +8 @@
 - Internationalization (A huge thank to rene-marc dolhen <rmd_at_mecreant.org> who achieved that big task)
 
-2.2.0 (2006-09-05)
+2.2.0 (2006-10-04)
+- start-nfs now exports variables taken from PXE command line to mondo to override parameters during archiving - Fix bug #21 (Bruno Cornec)
+- Fix for bug #71 mondo now works correctly on x86_64 (Brendan Bouffler/Bruno Cornec)
+- Fix for bug #4 (B. Baumer)
+- Fix PXE documentation (Brendan Bouffler)
+- Attempt to fix bug #25 - bonding support (Michael Shapiro/Bruno Cornec)
+- Write start and finish time to log - Fix bug #33 (Bruno Cornec)
+- New mr_stresc function to escape commands submitted to system and fixes [[debianBTS(379966)]] (Andree Leidenfrost)
+- New files mr_string.c and mr_string.h (v3.0 new organization) (Andree Leidenfrost)
+- Fix for [[debianBTS(320152)]] display problem in newt (Andree Leidenfrost)
+- Check for grub.conf being a symbolic link (Andree Leidenfrost)
+- AFS support (Andree Leidenfrost/Bruno Cornec)
+- Better post-nuke handling (first steps) (Andree Leidenfrost)
+- Icon for use in menus (Andree Leidenfrost)
+- Fix for bug #14 -E switch error (Bruno Cornec)
+- Fix for bug #6 mondorestore will ask for prefix during selectve restore (Bruno Cornec)
+- Fix for bug #21 prefix taken from PXE server first (Bruno Cornec)
+- Fix for bug #24 ps options (Bruno Cornec)
+>>>>>>> .merge-right.r888
 
 2.0.9 (2006-08-04)
@@ -22 +40 @@
 - nfsmount option added to allow redeployment from another NFS server (Bruno Cornec)
 - This version should work a bit better with files having special char bug #7421 - but more to come (Bruno Cornec)
-- Fix Debian Bug #369321 by increasing MAX_TAPECATALOG_ENTRIES to 8192 and bkpinfo->optimal_set_size to 16MB (Andree Leidenfrost)
+- Fix [[debianBTS(369321)]] by increasing MAX_TAPECATALOG_ENTRIES to 8192 and bkpinfo->optimal_set_size to 16MB (Andree Leidenfrost)
 - Fix problem with BurnProof+DVD (Andree Leidenfrost)
 - Fix bug #7820: mondo should now support files > 2GB (taps23_at_yahoo.com/Bruno Cornec)
 - Replaced all occurrences of egrep with 'grep -E' and of fgrep with 'grep -F' (Andree Leidenfrost)
-- Optimize grep usage - fixes Debian bug #222052 (Andree Leidenfrost)
+- Optimize grep usage - fixes [[debianBTS(222052)]] (Andree Leidenfrost)
 - Avoid false alerts about growisofs not running under sudo (Andree Leidenfrost)
 - Increase PPCFG_RAMDISK_SIZE to 350 MB (Thomas Börkel/Bruno Cornec)
@@ -68 +86 @@
 - files > 2GB are now really supported (Andree Leidenfrost)
 - new SGML based Mondo Rescue documentation + new Web site (Bruno Cornec/Andree Leidenfrost)
-- mondoarchive aborts when 'mindi --findkernel' gives a fatal error (See also Debian bug #352323.) (Andree Leidenfrost)
+- mondoarchive aborts when 'mindi --findkernel' gives a fatal error (See also [[debianBTS(352323)]].) (Andree Leidenfrost)
 - /tmp not excluded anymore from backup (Bruno Cornec)
 - New RPM Build environement (Bruno Cornec)

trunk/mondo/src/common/libmondo-devices.c

@@ -1578 +1578 @@
             if (bkpinfo->media_device != NULL) {
                 mr_asprintf(&tmp,
-                        _("I think I've found your %s burner at SCSI node %s; am I right on the money? Say no if you have an IDE burner and you are running a 2.6 kernel. Instead, specify the IDE burner's /dev address at the next screen."),
+                        _("I think I've found your %s burner at SCSI node %s; Is this correct ? (say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details."),
                         bkpinfo->backup_media_string,
                         bkpinfo->media_device);

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

@@ -1109 +1109 @@
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
         mr_asprintf(&command,
-                "ifconfig %s | awk '{print $5}'", nfs_dev);
+                "ifconfig %s | awk '{print $5}' | head -n1", nfs_dev);
         mac_addr = call_program_and_get_last_line_of_output(command);
         mr_asprintf(&command,
-                "ifconfig | grep -E '%s' | head -n1  | cut -d' ' -f1", mac_addr);
+                "ifconfig | grep -E '%s' | grep -v '%s' | head -n1  | cut -d' ' -f1", mac_addr);
         mr_free(nfs_dev);
         nfs_dev = call_program_and_get_last_line_of_output(command);

trunk/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -793 +793 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+    char *envtmp1 = NULL;
+    char *envtmp2 = NULL;
     char *command = NULL;
     char *iso_mnt = NULL;
@@ -854 +856 @@
             /* We need to override prefix value in PXE mode as it's 
              * already done in start-nfs */
+            envtmp1 = getenv("imgname");
+            if (envtmp1 == NULL) {
+                fatal_error("no imgname variable in environment");
+            }
             if (strstr(call_program_and_get_last_line_of_output
                ("cat /proc/cmdline"), "pxe")) {
-                    strcpy(bkpinfo->prefix,getenv("imgname"));
+                    mr_allocstr(bkpinfo->prefix,envtmp1);
             }
 
@@ -985 +991 @@
         /* We need to override values in PXE mode as it's 
          * already done in start-nfs */
+        envtmp1 = getenv("nfsmount");
+        if (envtmp1 == NULL) {
+            fatal_error("no nfsmount variable in environment");
+            }
+        envtmp2 = getenv("dirimg");
+        if (envtmp2 == NULL) {
+            fatal_error("no dirimg variable in environment");
+        }
         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"));
-            }
+                mr_allocstr(bkpinfo->nfs_mount,envtmp1);
+                mr_allocstr(bkpinfo->nfs_remote_dir,envtmp2);
+        }
     } else if (bkpinfo->backup_media_type == iso) {
         /* Patch by Conor Daly 23-june-2004