Changeset 3056 in MondoRescue

Timestamp:

Oct 31, 2012, 4:27:15 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Add option -sparse to all star calls to add support of sparse file in case of star usage, as afio sparse file support seems broken

Location:

branches/3.0/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• common/libmondo-verify.c (modified) (1 diff)
• mondorestore/mondo-rstr-compare.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (3 diffs)

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

@@ -213 +213 @@
     paranoid_free(tmp);
 
-    mr_asprintf(&command, "star H=exustar list=%s -c " STAR_ACL_SZ " file=%s",
+    mr_asprintf(&command, "star H=exustar list=%s -c -sparse " STAR_ACL_SZ " file=%s",
             filelist, fname);
     if (bkpinfo->use_lzo) {

branches/3.0/mondo/src/common/libmondo-verify.c

@@ -494 +494 @@
         if (strstr(tarball_fname, ".bz2"))
             sprintf(command,
-                    "star -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s",
+                    "star -sparse -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s",
                     tarball_fname,
                     (strstr(tarball_fname, ".bz2")) ? "-bz" : " ", outlog,

branches/3.0/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -312 +312 @@
     {
         sprintf(command,
-                "%s -diff H=exustar file=%s >> %s 2>> %s",
+                "%s -sparse -diff H=exustar file=%s >> %s 2>> %s",
                 archiver_exe, tarball_fname, logfile, logfile);
     } else {

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

@@ -1772 +1772 @@
 //      if (strstr(tarball_fname, ".star."))
         if (use_star) {
-            mr_asprintf(&command, "star -x -force-remove -U " STAR_ACL_SZ " errctl= file=%s", tarball_fname);
+            mr_asprintf(&command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " errctl= file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
                 mr_strcat(command, " -bz");
@@ -1960 +1960 @@
         if (strstr(tarball_fname, ".star.")) {
             use_star = TRUE;
-            sprintf(command, "star -t file=%s %s", afio_fname, executable);
+            sprintf(command, "star -sparse -t file=%s %s", afio_fname, executable);
         } else {
             use_star = FALSE;
@@ -1995 +1995 @@
     if (strstr(tarball_fname, ".star."))    // star
     {
-        sprintf(command, "star -x file=%s %s", afio_fname, executable);
+        sprintf(command, "star -sparse -x file=%s %s", afio_fname, executable);
         if (filelist) {
             sprintf(command + strlen(command), " list=%s",