Changeset 2635 in MondoRescue for branches/2.2.10/mondo/src/common

Timestamp:

May 17, 2010, 5:57:40 AM (15 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 2586:2634 ​svn+ssh://bruno@svn.mondorescue.org/mondo/svn/mondorescue/branches/2.2.9

• Avoids error messages from stat in analyze-my-lvm
• Avoid perl warning by removing non-exitent dirs from @INC in mindi-get-perl-modules r3744@localhost: bruno | 2010-03-16 01:44:33 +0100
  • Fix a bug on Mandriva modules analysis (at least) (Backport from mindi 2.1.0)
• Try to improve exclusion of binded /proc mount with "none" fs type exclusion Cf: #397
• Adds gmane mirror on the support page of the web site.
• More website improvements based on Tom Metro feedbacks
• Adds Nable ML archive
• For gmane prefer the threaded view to the blog one.
• Fix an initialization bug for network protocol in interactive mode (was NULL and not NFS by default)
• Put an explicit notice of MondoRescue's license: GPLv2 or later (as per Hugo's notice in sources)
• Adds tee to deplist
• Fix #412 by supporting grub-install.unsupported for OpenSuSE and solving an issue with the parameter passed to grub for device which should be a device name, not a partition.
• Fix #413 where list of devices was not re-initialized correctly in a loop (Michael Shapiro)
• Fix #415 by avoiding integration of unknown devices report from pvscan (Mike Shapiro)
• Fix #414 by adding a function GetPVsForLV to remove PVs from excluded LVs (Mike Shapiro)
• Fixes for #414: remove comments from grub conf file if used and improve grub conf file generation
• Fix a typo (Mike Shapiro)
• Improved msg for USB device creation
• Mondoarchive should not try to cerate a cmp binary if it doesn't exist.
• Fix a bug on ia64 where the boot image generated was removed before use in mondo
• Avoid to have multiple similar calls to mkisofs by using macros r3946@localhost: bruno | 2010-05-04 19:17:51 +0200
  • Solves an issue with usage of -V option in mkiofs wrongly placed
• netfs_proto should be initialized in every case, not just in DR (should solve remaining NULL reports)
• Integrate Michael Shapiro's patch on Xen Kernel support for RHEL 5 (only atm) and fixes #418 (Michael Shapiro)
• Fox a typo in a Web page
• Precise that GPL is v2+ (as per Hugo's wish)
• Improve display of messages (removes extra \n) and replace a stract with "" with " ". trying to debug #421
• Remove a wrong usage of mr_strcat with exclude_path in the 2.2.9 version (probably cause of #421)
• Fix strcat call !

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-archive.c (modified) (2 diffs)
• libmondo-devices.c (modified) (6 diffs)
• libmondo-filelist.c (modified) (1 diff)
• libmondo-tools.c (modified) (3 diffs)

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

@@ -1711 +1711 @@
         if (bkpinfo->nonbootable_backup) {
             log_msg(1, "Making nonbootable backup");
-// FIXME --- change mkisofs string to MONDO_MKISOFS_NONBOOTABLE and add ' .' at end
-            res = eval_call_to_make_ISO("mkisofs -o '_ISO_' -r -p MondoRescue -publisher www.mondorescue.org -A MondoRescue_GPL -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
+            res = eval_call_to_make_ISO(MONDO_MKISOFS"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
         } else {
             log_msg(1, "Making bootable backup");
@@ -1725 +1724 @@
             if (bkpinfo->make_cd_use_lilo) {
                 log_msg(1, "make_cd_use_lilo = TRUE");
-// FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
-// and add ' .' at end
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                res = eval_call_to_make_ISO("mkisofs -no-emul-boot -b images/mindi-bootroot." IA64_BOOT_SIZE ".img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
+                res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_ELILO"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
 #else
-// FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
-// and add ' .' at end
                 log_msg(1, "Non-ia64 --> lilo");
-                res =
-                    eval_call_to_make_ISO("mkisofs -b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
+                    // FIXME: fixed boot size probably wrong. lilo to be removed
+                res = eval_call_to_make_ISO(MONDO_MKISOFS"-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .", destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
 #endif
             } else {
                 log_msg(1, "make_cd_use_lilo = FALSE");
                 log_msg(1, "Isolinux");
-                res = eval_call_to_make_ISO("mkisofs -no-emul-boot -b isolinux.bin -boot-load-size 4 -boot-info-table -c boot.cat -o '_ISO_' -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", destfile, g_current_media_number, message_to_screen);
+                res = eval_call_to_make_ISO(MONDO_MKISOFS_REGULAR_SYSLINUX"-o '_ISO_' -V _CD#_ .", destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
             }
         }

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

@@ -120 +120 @@
 
     tmp = where_is_root_mounted();
-    log_msg(0, "root is currently mounted at %s\n", tmp);
+    log_msg(0, "root is currently mounted at %s", tmp);
 
 #ifdef __FreeBSD__
@@ -1877 +1877 @@
     while (DSFptr != NULL) {
         if (DSFptr->check) {
-            log_msg (4, "%s is mounted on %s and is on disk %s\n", DSFptr->device, DSFptr->mount_point, ndsf);
+            log_msg (4, "%s is mounted on %s and is on disk %s", DSFptr->device, DSFptr->mount_point, ndsf);
             strcat(*included_dsf_list, DSFptr->mount_point);
             strcat(*included_dsf_list, " ");
         } else {
-            log_msg (4, "%s is mounted on %s and is NOT on disk %s\n", DSFptr->device, DSFptr->mount_point, ndsf);
+            log_msg (4, "%s is mounted on %s and is NOT on disk %s", DSFptr->device, DSFptr->mount_point, ndsf);
             strcat(*excluded_dsf_list, DSFptr->mount_point);
             strcat(*excluded_dsf_list, " ");
@@ -1921 +1921 @@
         if (mode == 'E') {
             if (strlen(mounted_on_dsf)) {
-                log_to_screen("Excluding the following file systems on %s:\n", token);
-                log_to_screen("  %s\n", mounted_on_dsf);
+                log_to_screen("Excluding the following file systems on %s:", token);
+                log_to_screen("==> %s", mounted_on_dsf);
                 log_msg (5, "Adding to bkpinfo->exclude_paths due to -E option: %s", mounted_on_dsf);
                 mr_strcat(bkpinfo->exclude_paths, " %s ", mounted_on_dsf);
@@ -1928 +1928 @@
             }
         } else {
-            log_to_screen("Archiving only the following file systems on %s:\n", token);
-            log_to_screen("  %s\n", mounted_on_dsf);
-            strcpy(bkpinfo->include_paths, "/");
+            log_to_screen("Archiving only the following file systems on %s:", token);
+            log_to_screen("==> %s", mounted_on_dsf);
+            mr_free(bkpinfo->include_paths);
+            mr_asprintf(bkpinfo->include_paths, "%s", "/");
             if (strlen(not_mounted_on_dsf)) {
                 log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
-                log_to_screen("Not archiving the following file systems:\n");
-                log_to_screen("  %s\n", not_mounted_on_dsf);
-                mr_strcat(bkpinfo->exclude_paths, " %s ", mounted_on_dsf);
+                log_to_screen("Not archiving the following file systems:");
+                log_to_screen("==> %s", not_mounted_on_dsf);
+                mr_strcat(bkpinfo->exclude_paths, " %s ", not_mounted_on_dsf);
             }
         }
@@ -2789 +2790 @@
         /* Never try to eject a NETFS device */
         bkpinfo->please_dont_eject = TRUE;
+        /*  Force NFS to be the protocol by default */
+        if (bkpinfo->netfs_proto == NULL) {
+            mr_asprintf(bkpinfo->netfs_proto, "nfs");
+        }
 
         /* Initiate bkpinfo netfs_mount path from running environment if not already done */
@@ -2851 +2856 @@
             mr_free(command);
 
-            p = popup_and_get_string("Network protocol", "Which Network protocol should I use?", bkpinfo->netfs_proto);
-            if (p == NULL) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-            mr_free(bkpinfo->netfs_proto);
-            bkpinfo->netfs_proto = p;
-
-            p = popup_and_get_string("Network share", "Which remote Network share should I mount?", bkpinfo->netfs_mount);
-            if (p == NULL) {
-                log_to_screen("User has chosen not to backup the PC");
-                finish(1);
-            }
-            mr_free(bkpinfo->netfs_mount);
-            bkpinfo->netfs_mount = p;
-        }
+        }
+        p = popup_and_get_string("Network protocol", "Which Network protocol should I use?", bkpinfo->netfs_proto);
+        if (p == NULL) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        mr_free(bkpinfo->netfs_proto);
+        bkpinfo->netfs_proto = p;
+
+        p = popup_and_get_string("Network share", "Which remote Network share should I mount?", bkpinfo->netfs_mount);
+        if (p == NULL) {
+            log_to_screen("User has chosen not to backup the PC");
+            finish(1);
+        }
+        mr_free(bkpinfo->netfs_mount);
+        bkpinfo->netfs_mount = p;
+
         /* Initiate bkpinfo isodir path from running environment if mount already done */
         mr_free(bkpinfo->isodir);

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

@@ -1358 +1358 @@
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        mr_asprintf(strtmp, "find '%s' -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o %s -type d -print > %s 2> /dev/null", dir, find_excludes, g_skeleton_filelist);
+        mr_asprintf(strtmp, "find '%s' -fstype mvfs -prune -o -fstype devpts -prune -o -fstype tmpfs -prune -o -fstype proc -prune -o -fstype sysfs -prune -o -fstype rpc_pipefs -prune -o -fstype none -prune -o %s -type d -print > %s 2> /dev/null", dir, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude

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

@@ -514 +514 @@
 
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_NONBOOT);
+            mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS);
         } else if
 #ifdef __FreeBSD__
@@ -523 +523 @@
 #ifdef __IA64__
     {
-        mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
+        mr_asprintf(mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_ELILO);
     }
 #else
     {
-        mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
+        mr_asprintf(mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_LILO);
     }
 #endif
-        else {
-            mr_asprintf(mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
+        else
+        {
+            mr_asprintf(mondo_mkisofs_sz, "%s -V _CD#_", MONDO_MKISOFS_REGULAR_SYSLINUX);
         }
 
@@ -950 +951 @@
     }
 
-    tmp = find_home_of_exe("cmp");
-    if (!tmp) {
-        mr_free(tmp);
-        tmp = find_home_of_exe("true");
-        if (!tmp) {
-            retval += whine_if_not_found("cmp");
-        } else {
-            log_to_screen("Your system lacks the 'cmp' binary. I'll create a dummy cmp for you.");
-            if (run_program_and_log_output("cp -f `which true` /usr/bin/cmp", 0)) {
-                mr_free(tmp);
-                fatal_error("Failed to create dummy 'cmp' file.");
-            }
-        }
-    }
-    mr_free(tmp);
+    if (!find_home_of_exe("cmp")) {
+        whine_if_not_found("cmp");
+    }
 
     run_program_and_log_output("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);