Changeset 2850 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-devices.c

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

File:

• branches/2.2.10/mondo/src/common/libmondo-devices.c (modified) (7 diffs)

branches/2.2.10/mondo/src/common/libmondo-devices.c

@@ -2019 +2019 @@
                     mr_strcat(bkpinfo->exclude_paths,"|%s",mounted_on_dsf);
                 } else {
-                    mr_asprintf(bkpinfo->exclude_paths,"%s",mounted_on_dsf);
+                    mr_asprintf(&(bkpinfo->exclude_paths),"%s",mounted_on_dsf);
                 }
                 if (bkpinfo->exclude_devs) {
                     mr_strcat(bkpinfo->exclude_devs,"|%s",token);
                 } else {
-                    mr_asprintf(bkpinfo->exclude_devs,"%s",token);
+                    mr_asprintf(&(bkpinfo->exclude_devs),"%s",token);
                 }
             }
@@ -2039 +2039 @@
                     mr_strcat(bkpinfo->exclude_paths, "|%s",not_mounted_on_dsf);
                 } else {
-                    mr_asprintf(bkpinfo->exclude_paths,"%s",not_mounted_on_dsf);
+                    mr_asprintf(&(bkpinfo->exclude_paths),"%s",not_mounted_on_dsf);
                 }
             }
@@ -2625 +2625 @@
     char *tmp = NULL;
     char *p = NULL;
+    char *q = NULL;
     char *mds = NULL;
     char *sz_size = NULL;
@@ -2915 +2916 @@
             if (bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] == '/')
                 bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] = '\0';
-            mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", bkpinfo->netfs_mount);
+            q = strchr(bkpinfo->netfs_mount, '@');
+            if (q != NULL) {
+                /* User found. Store the 2 values */
+                q++;
+                /* new netfs mount */
+                mr_asprintf(tmp,"%s",q);
+            } else {
+                mr_asprintf(tmp,"%s",bkpinfo->netfs_mount);
+            }
+            mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", tmp);
+            mr_free(tmp);
+
             mr_free(bkpinfo->isodir);
             bkpinfo->isodir = call_program_and_get_last_line_of_output(command,TRUE);
@@ -2964 +2976 @@
         bkpinfo->netfs_mount = p;
 
+        if (bkpinfo->netfs_user) {
+            strcpy(tmp1, bkpinfo->netfs_user);
+        } else {
+            strcpy(tmp1, "");
+        }
+        if (!popup_and_get_string
+            ("Network user", "Which user should I use if any ?",
+             tmp1, MAX_STR_LEN)) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        mr_free(bkpinfo->netfs_user);
+        if (strcmp(tmp1, "") != 0) {
+            mr_asprintf(&(bkpinfo->netfs_user), "%s", tmp1);
+        }
+    
         /* Initiate bkpinfo isodir path from running environment if mount already done */
         mr_free(bkpinfo->isodir);
@@ -2977 +3005 @@
             if (bkpinfo->restore_data) {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(tmp, "sshfs -o ro %s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+                    mr_asprintf(tmp, "sshfs -o ro");
                 } else {
-                    mr_asprintf(tmp, "mount -t %s -o nolock,ro %s %s", bkpinfo->netfs_proto, bkpinfo->netfs_mount, bkpinfo->isodir);
+                    mr_asprintf(tmp, "mount -t %s -o nolock,ro", bkpinfo->netfs_proto);
                 }
             } else {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    mr_asprintf(tmp, "sshfs %s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
+                    mr_asprintf(tmp, "sshfs");
                 } else {
-                    mr_asprintf(tmp, "mount -t %s -o nolock %s %s", bkpinfo->netfs_proto, bkpinfo->netfs_mount, bkpinfo->isodir);
+                    mr_asprintf(tmp, "mount -t %s -o nolock", bkpinfo->netfs_proto);
                 }
             }
+            if (bkpinfo->netfs_user) {
+                mr_strcat(tmp, "%s@", bkpinfo->netfs_user);
+            }
+            mr_strcat(tmp, "%s %s", bkpinfo->netfs_mount, bkpinfo->isodir);
             run_program_and_log_output(tmp, 3);
             mr_free(tmp);
@@ -3212 +3244 @@
             bkpinfo->zip_suffix = NULL;
         }
+
         bkpinfo->verify_data =
             ask_me_yes_or_no