Changeset 2850 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-tools.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-tools.c (modified) (6 diffs)

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

@@ -168 +168 @@
     char *tmp = NULL;
 
-    mr_asprintf(tmp, "for i in `find /root /home -type d -name Desktop -maxdepth 2`; do file=$i/.directory; if [ -f \"$file\" ] ; then mv -f $file $file.old ; awk '{if (index($0, \"rootimagesmindi\")) { while (length($0)>2) { getline;} ; } else { print $0;};}' $file.old  > $file ; fi ; done");
+    mr_asprintf(tmp, "for i in `find /root /home -maxdepth 2 -type d -name Desktop -maxdepth 2`; do file=$i/.directory; if [ -f \"$file\" ] ; then mv -f $file $file.old ; awk '{if (index($0, \"rootimagesmindi\")) { while (length($0)>2) { getline;} ; } else { print $0;};}' $file.old  > $file ; fi ; done");
     run_program_and_log_output(tmp, 5);
     mr_free(tmp);
@@ -310 +310 @@
 #endif
 }
-
 
 /**
@@ -349 +348 @@
     char *command = NULL;
     char *hostname = NULL;
+    char *isofs_cmd = NULL;
     char *ip_address = NULL;
     int retval = 0;
@@ -518 +518 @@
         mr_free(tmp);
 
+        if (find_home_of_exe("genisoimage")) {
+            mr_asprintf(isofs_cmd, "%s", MONDO_GENISOIMAGE_CMD);
+        } else {
+            mr_asprintf(isofs_cmd, "%s", MONDO_MKISOFS_CMD);
+        }
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS);
+            mr_asprintf(mondo_mkisofs_sz, "%s%s", isofs_cmd, MONDO_MKISOFS);
         } else if
 #ifdef __FreeBSD__
@@ -528 +533 @@
 #ifdef __IA64__
     {
-        mr_asprintf(mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_ELILO);
+        mr_asprintf(mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_ELILO);
     }
 #else
     {
-        mr_asprintf(mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_LILO);
+        mr_asprintf(mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            mr_asprintf(mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(mondo_mkisofs_sz, "%s%s -V _CD#_", isofs_cmd, MONDO_MKISOFS_REGULAR_SYSLINUX);
         }
 
         mr_free(bkpinfo->call_make_iso);
+        mr_free(isofs_cmd);
+
         if (bkpinfo->manual_cd_tray) {
             if (bkpinfo->call_before_iso == NULL) {
@@ -628 +635 @@
 
             *colon = '\0';
-            hent = gethostbyname(hostname);
+            colon = strchr(hostname, '@');
+            if (colon) {
+                *colon = '\0';
+                colon++;
+                hent = gethostbyname(colon);
+                mr_asprintf(bkpinfo->netfs_user,"%s", hostname);
+            } else {
+                hent = gethostbyname(hostname);
+            }
             if (!hent) {
                 log_it("Can't resolve Network mount (%s): %s", hostname, hstrerror(h_errno));