Changeset 2850 in MondoRescue for branches/2.2.10/mondo/src/mondorestore

Timestamp:

Jul 24, 2011, 4:12:44 AM (13 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 2773:2849 2.2.9 in 2.2.10

• Adds 3 binaries called potentially by udev o support USB key mount at restore time (Victor Gattegno)
• Really support both mkisofs and genisoimage everywhere
• Try to handle netfs_user better in all cases (NFS and SSHFS)
  • Improve logging in init script
  • Format improvement
  • Removes a warning when trying to launch udevadm and it doesn't exist (RHEL 5 e.g.)
  • Fix syntax description in mondoarchive man page for -E & -I with |
• Adds download entries for new distro supported (Mageia, Fedora 15, Ubuntu 11.04)

-Fix mindi-get-perl-modules when perl dirs in @INC are symlinks (case on Ubuntu 11.04)

• Fix option --findkernel in case of Xen kernel so that mondoarchive get a correct answer instead of an empty one.
• Fix multi-media restore by umounting it before looping to ask for the next (as if already mounted, will not pass to the next alone)
• Fix 485 by replacing a wrong call to mr_asprintf which was provoking core dumped.
• Fix -E and -I example in man page which were lacking the '|' as separator
• Fix #484 by adding support for the arcmsr driver (to support the Areca ARC-1220 RAID Controller)
  • Avoids error msgs if no mondo-restore.cfg file exists (when mindi used stdalone)
  • Adds the swapon feature to mindi-busybox
  • Attempt to fix Xen kernel support by avoiding to remove xen kernel fro; the possible_kernels list too early, whereas it's used afterwards to get them.
  • Fix #481 by supporting the new kbd file in latest Ubuntu 10.10+ (victor.gattegno_at_hp.com)
• Update from Lester Wade on P2V doc including RHEL6 validation and some minor additions
• removes telinit call in busybox o try to fix problems whn reboot at end of restore.
• if -E option for mondoarchive was not specified, variable excp points to NULL, so string exclude_pathes contained '(null)' instead of being avoided (derived from a patch from taguchi_at_ff.iij4u.or.jp)
• fix -maxdepth option for find command. it sould be '-maxdepth .. -name ..', not '-name .. -maxdepth ..' (patch from taguchi_at_ff.iij4u.or.jp)
• Adds an extraversion for revision support
• Adds support for ifconfig and ping for PXE+NFS boot for this version of mindi-busybox
• Example of MINDI_ADDITIONAL_BOOT_PARAMS in mindi.conf added
• fix a compilation error
• Remove an absolute ref in the docs web page

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-rstr-tools.c (modified) (3 diffs)
• mondorestore.c (modified) (4 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -702 +702 @@
         mr_free(value);
 
+        mr_free(bkpinfo->netfs_user);
+        if ((value = read_cfg_var(cfg_file, "netfs-server-user")) == 0) {
+            mr_asprintf(bkpinfo->netfs_user,"%s", value);
+        }
+
         mr_free(bkpinfo->netfs_proto);
         if ((value = read_cfg_var(cfg_file, "netfs-proto")) == 0) {
@@ -713 +718 @@
         mr_free(bkpinfo->prefix);
         if ((value = read_cfg_var(cfg_file, "iso-prefix")) == 0) {
-            mr_asprintf(bkpinfo->prefix, "%s", value);
-        } else {
-            mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
-        }
-        mr_free(value);
+            mr_asprintf(bkpinfo->prefix,"%s", value);
+        } else {
+            mr_asprintf(bkpinfo->prefix,"%s", STD_PREFIX);
+        }
     
         tmp = call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE);
@@ -936 +940 @@
         if (bkpinfo->netfs_proto != NULL) {
             log_msg(2, "netfs_proto is %s", bkpinfo->netfs_proto);
+        }
+        if (bkpinfo->netfs_user != NULL) {
+            log_msg(2, "netfs_user is %s", bkpinfo->netfs_user);
         }
     }

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -838 +838 @@
                         "Using tune2fs to identify your ext2,3 partitions");
 
-    mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
+    mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", g_mountlist_fname, MONDO_LOGFILE, MONDO_LOGFILE);
     res = run_program_and_log_output(tmp, TRUE);
     mr_free(tmp);
@@ -2046 +2046 @@
 
     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-    log_msg(2, "Insisting on 1st CD");
+    log_msg(2, "Insisting on 1st media, so that I can have a look at LAST-FILELIST-NUMBER");
     if (g_current_media_number != 1) {
         log_msg(3, "OK, that's jacked up.");
@@ -2136 +2136 @@
         }
         mr_free(tarball_fname);
+
+        /* Now we need to umount the current media to have the next mounted by insist_on_this_cd_number */
+        run_program_and_log_output("umount " MNT_CDROM, FALSE);
     }
     mr_free(mds);
@@ -2817 +2820 @@
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(tmp, "sshfs -o ro %s /tmp/isodir", bkpinfo->netfs_mount);
+                    if (bkpinfo->netfs_user) {
+                        mr_asprintf(tmp, "sshfs -o ro %s@%s /tmp/isodir", bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                    } else {
+                        mr_asprintf(tmp, "sshfs -o ro %s /tmp/isodir", bkpinfo->netfs_mount);
+                    }
                 } else {
-                    mr_asprintf(tmp, "mount %s -o nolock,ro /tmp/isodir", bkpinfo->netfs_mount);
+                    if (bkpinfo->netfs_user) {
+                        mr_asprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir", bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                    } else {
+                        mr_asprintf(tmp, "mount %s -o nolock,ro /tmp/isodir", bkpinfo->netfs_mount);
+                    }
                 }
                 run_program_and_log_output(tmp, 1);