Changeset 1939 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c

Timestamp:

May 17, 2008, 1:29:54 AM (16 years ago)

Author:

Bruno Cornec

Message:

svn merge -r 1923:1938 $SVN_M/branches/2.2.6

File:

• branches/stable/mondo/src/common/libmondo-archive.c (modified) (4 diffs)

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

@@ -951 +951 @@
             mr_free(command);
         } else {
-            mr_asprintf(&command, "cp -f %s/mindi-*oot*.img %s/images",
-                bkpinfo->tmpdir, bkpinfo->scratchdir);
-            if (system(command)) {
-                mr_msg(2, "Unable to copy mindi images");
-            }
-            mr_free(command);
-
             mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s",
                  bkpinfo->scratchdir, bkpinfo->tmpdir);
@@ -1368 +1361 @@
     int i;
     char *curr_xattr_list_fname = NULL;
-    char *curr_acl_list_fname;
+    char *curr_acl_list_fname = NULL;
     int misc_counter_that_is_not_important = 0;
 
@@ -1476 +1469 @@
                 res += write_EXAT_files_to_tape(curr_xattr_list_fname,
                                                 curr_acl_list_fname);
+                // archives themselves
+                res +=
+                    write_EXAT_files_to_tape(curr_xattr_list_fname,
+                                             curr_acl_list_fname);
                 // archives themselves
                 res +=
@@ -2152 +2149 @@
                                                    curr_afioball_fname);
             iamhere("Writing EXAT files");
-            res += write_EXAT_files_to_tape(curr_xattr_list_fname,
-                                            curr_acl_list_fname);
+            res +=
+                write_EXAT_files_to_tape(curr_xattr_list_fname,
+                                         curr_acl_list_fname);
             // archives themselves
             res = move_files_to_stream(curr_afioball_fname, NULL);