Changeset 3145 in MondoRescue

Timestamp:

Jun 14, 2013, 5:01:17 PM (11 years ago)

Author:

Bruno Cornec

Message:

r5361@localhost: bruno | 2013-06-14 12:18:21 +0200

• Remove the errctl field used in star and log all star msgs into mondorestore.log
• Avoids going into acl/xattr handling for star case as it's done natively

File:

• branches/3.0/mondo/src/mondorestore/mondorestore.c (modified) (2 diffs)

branches/3.0/mondo/src/mondorestore/mondorestore.c

@@ -1768 +1768 @@
 //      if (strstr(tarball_fname, ".star."))
         if (use_star) {
-            mr_asprintf(&command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " errctl= file=%s", tarball_fname);
+            mr_asprintf(&command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
                 mr_strcat(command, " -bz");
@@ -1799 +1799 @@
         }
 
-        if (g_getfattr) {
-            log_msg(1, "Setting fattr list %s", xattr_fname);
-            if (length_of_file(xattr_fname) > 0) {
-                res = set_fattr_list(filelist_subset_fname, xattr_fname);
-                if (res) {
-                    log_to_screen
-                        ("Errors occurred while setting extended attributes");
-                } else {
-                    log_msg(1, "I set xattr OK");
+        if (! use_star) {
+            if (g_getfattr) {
+                log_msg(1, "Setting fattr list %s", xattr_fname);
+                if (length_of_file(xattr_fname) > 0) {
+                    res = set_fattr_list(filelist_subset_fname, xattr_fname);
+                    if (res) {
+                        log_to_screen("Errors occurred while setting extended attributes");
+                    } else {
+                        log_msg(1, "I set xattr OK");
+                    }
+                    retval += res;
                 }
-                retval += res;
-            }
-        }
-        if (g_getfacl) {
-            log_msg(1, "Setting acl list %s", acl_fname);
-            if (length_of_file(acl_fname) > 0) {
-                res = set_acl_list(filelist_subset_fname, acl_fname);
-                if (res) {
-                    log_to_screen
-                        ("Errors occurred while setting access control lists");
-                } else {
-                    log_msg(1, "I set ACL OK");
+            }
+            if (g_getfacl) {
+                log_msg(1, "Setting acl list %s", acl_fname);
+                if (length_of_file(acl_fname) > 0) {
+                    res = set_acl_list(filelist_subset_fname, acl_fname);
+                    if (res) {
+                        log_to_screen("Errors occurred while setting access control lists");
+                    } else {
+                        log_msg(1, "I set ACL OK");
+                    }
+                    retval += res;
                 }
-                retval += res;
-            }
-        }
-        if (retval) {
+            }
+        } else {
+            retval = res;
+        }
+        // Be verbose for star
+        if (retval || use_star) {
             mr_asprintf(&command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
             paranoid_system(command);
             paranoid_free(command);
 
-            log_msg(2, "Errors occurred while processing fileset #%d",
-                    current_tarball_number);
+            if (retval) {
+                log_msg(2, "Errors occurred while processing fileset #%d", current_tarball_number);
+            }
         } else {
             log_msg(2, "Fileset #%d processed OK", current_tarball_number);