Changeset 2569 in MondoRescue for branches/2.2.10/mondo

Timestamp:

Feb 2, 2010, 10:40:28 AM (14 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 2545:2567 /mondorescue/branches/2.2.9

• Improve device exclusion for LVM by adding support for symlinks and mapper systematically at all levels (PV, VG, LV). Shoul

d really provvide the best support possible for LVM exclusion.

• Now supports also exclusion of LVs directly
• Improve mindi by handling excluded devices earlier in the loop.
• Fix LV exclusion when VGs are excluded (the excludedvgs file has to be removed at start and end of analyze-my-lvm not in fu

nctions, as they are called multiple times)

• Rename some variables exported to avoid accidental conflict (EXCLUDE_DEVS => MINDI_EXCLUDE_DEVS and ADDITIONAL_BOOT_PARAMS

=> MINDI_ADDITIONAL_BOOT_PARAMS)

• setfattr also needs the -h flag to restore attributes on symlinks, not on the target file (which may not exist BTW). Should solve #388.
• Using forcemods="mod1 mod2" will now do something and load those modules first
• Update web page on distributions to download
• Add support for ums_cypress module in mindi
• Fix acl backup which was completely wrong.
• Fix a bug where LV were not created anymore if no exclusion !!
• In analyze-my-lvm only use pv.tmp2 when it exists to avoid error msgs

-Adds support for links to modules (.ko pointing to .o) such as with VMWare extensions

• Adds i-want-my-lvm content in mindi log file
• Adds vmxnet3 driver support to mindi for some VMWare versions
• Fix a typo in the way device mapper files where excluded
• use option -h of getfattr to *not* follow symlinks, which breaks RHEL 5.4 as reported in #388. However, getfacl doesn't provide such an option.
• Adds some logs for filelist creation
• Remove option -P from getfattr which may also skip symlinks - Attempt to solve #388
• Exclude rpc_pipefs type of filesystems from find
• Suppress unused mode_of_file function

Location:

branches/2.2.10/mondo/src/common

Files:

• libmondo-filelist.c (modified) (6 diffs)
• libmondo-files-EXT.h (modified) (2 diffs)
• libmondo-files.c (modified) (1 diff)
• libmondo-files.h (modified) (2 diffs)

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

@@ -279 +279 @@
         }
         if (siz > max_sane_size_for_a_file) {
+            log_msg(10, "Adding %s to big files\n", incoming);
             fprintf(fbig, "%s\n", incoming);
         } else {
             curr_set_size += siz;
+            log_msg(10, "Adding %s to filelist %d\n", incoming, curr_set_no);
             fprintf(fout, "%s\n", incoming);
             if (curr_set_size > maxsetsizeK) {
@@ -464 +466 @@
         mr_free(strtmp);
 
+        log_msg(20,"calling %s\n",syscall);
         call_exe_and_pipe_output_to_fd(syscall, pout);
         mr_free(syscall);
@@ -485 +488 @@
         mr_free(command);
 
-        mr_asprintf(command, "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s", filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
-        log_it("%s",command);
-        retval = system(command);
-        mr_free(command);
+        retval =
+            gen_aux_list(filelist, "getfacl --all-effective -P %s", facl_fname);
     }
     return (retval);
@@ -504 +505 @@
         mr_free(command);
         retval =
-            gen_aux_list(filelist, "getfattr --en=hex -P -m - -d \"%s\"",
-                         fattr_fname);
+            gen_aux_list(filelist, "getfattr --en=hex -m - -h -d \"%s\"", fattr_fname);
     }
     return (retval);
@@ -531 +531 @@
         || !does_file_exist(orig_msklist)) {
         log_msg(1, "No masklist provided. I shall therefore set ALL attributes.");
-        mr_asprintf(command, "gzip -dc %s | %s --restore - 2>> %s", original_exat_fname, executable, MONDO_LOGFILE);
+        mr_asprintf(command, "gzip -dc %s | %s -h --restore - 2>> %s", original_exat_fname, executable, MONDO_LOGFILE);
         log_msg(1, "command = %s", command);
         retval = system(command);
@@ -1356 +1356 @@
 #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 %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 %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-files-EXT.h

@@ -7 +7 @@
 extern unsigned int updcrcr(unsigned int crc, unsigned int c);
 extern char *calc_checksum_of_file(char *filename);
-extern char *calc_file_ugly_minichecksum(char *curr_fname);
 extern long count_lines_in_file(char *filename);
 extern bool does_file_exist(char *filename);
@@ -48 +47 @@
 extern int make_grub_install_scriptlet(char *outfile);
 extern int read_one_liner_data_file(char *fname, char *contents);
-extern int mode_of_file(char *fname);

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

@@ -1270 +1270 @@
 
 
-int mode_of_file(char *fname)
-{
-    struct stat buf;
-
-    if (lstat(fname, &buf)) {
-        return (-1);
-    }                           // error
-    else {
-        return (buf.st_mode);
-    }
-}
-
-
-
-
 /**
  * Create a small script that mounts /boot, calls @c grub-install, and syncs the disks.

branches/2.2.10/mondo/src/common/libmondo-files.h

@@ -9 +9 @@
 unsigned int updcrcr(unsigned int crc, unsigned int c);
 char *calc_checksum_of_file(char *filename);
-char *calc_file_ugly_minichecksum(char *curr_fname);
-char *calc_file_ugly_minichecksum(char *curr_fname);
 long count_lines_in_file(char *filename);
 bool does_file_exist(char *filename);
@@ -49 +47 @@
 
 int read_one_liner_data_file(char *fname, char *contents);
-int mode_of_file(char *fname);