Changeset 3147 in MondoRescue for branches/3.1/mondo/src/mondorestore/mondorestore.c

Timestamp:

Jun 19, 2013, 8:34:46 AM (11 years ago)

Author:

Bruno Cornec

Message:

• First pass on svn merge -r 2935:3146 ../3.0

File:

• branches/3.1/mondo/src/mondorestore/mondorestore.c (modified) (19 diffs)

branches/3.1/mondo/src/mondorestore/mondorestore.c

@@ -63 +63 @@
  */
 bool g_ISO_restore_mode = FALSE;    /* are we in Iso Mode? */
+
+/* Whether we should fail immediately at first error */
+bool g_fail_immediately = FALSE;
 
 /**
@@ -618 +621 @@
         ("Label/Identify your ext2/ext3/ext4 partitions if necessary?")) {
         mvaddstr_and_log_it(g_currentY, 0,
-                            "Using tune2fs to identify your ext2,3,4 partitions");
+                            "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
         if (does_file_exist("/tmp/fstab.new")) {
             mr_asprintf(fstab_fname, "/tmp/fstab.new");
@@ -710 +713 @@
 
 
-/*            MONDO - saving your a$$ since Feb 18th, 2000            */
+/*            MONDO - saving your systems since Feb 18th, 2000            */
 
 
@@ -730 +733 @@
     int retval = 0;
     int res = 0;
-    bool boot_loader_installed = FALSE;
     char *tmp = NULL;
     char *tmp1 = NULL;
@@ -829 +831 @@
         log_msg(1,
                 "Great! Boot loader was installed. No need for msg at end.");
-        boot_loader_installed = TRUE;
     }
     clean_blkid();
@@ -836 +837 @@
     mvaddstr_and_log_it(g_currentY,
                         0,
-                        "Using tune2fs to identify your ext2,3 partitions");
+                        "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
 
     mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
@@ -1601 +1602 @@
 
         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 " file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
                 mr_strcat(command, " -bz");
@@ -1639 +1640 @@
         }
 
-        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);
-            system(command);
+            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);
@@ -1782 +1788 @@
         if (strstr(tarball_fname, ".star.")) {
             use_star = TRUE;
-            mr_asprintf(command, "star -t file=%s %s", afio_fname, executable);
+            mr_asprintf(command, "star -sparse -t file=%s %s", afio_fname, executable);
         } else {
             use_star = FALSE;
@@ -1816 +1822 @@
     if (strstr(tarball_fname, ".star.")) {
         // star
-        mr_asprintf(command, "star -x file=%s %s", afio_fname, executable);
+        mr_asprintf(command, "star -sparse -x file=%s %s", afio_fname, executable);
         if (filelist) {
             mr_strcat(command, " list=%s", filelist_subset_fname);
@@ -2216 +2222 @@
     res = read_header_block_from_stream(&biggie_size, biggie_fname, &ctrl_chr);
     if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-        res =
-            read_EXAT_files_from_tape(&biggie_size, biggie_fname, &ctrl_chr, xattr_fname, acl_fname);
+        res = read_EXAT_files_from_tape(&biggie_size, biggie_fname, &ctrl_chr, xattr_fname, acl_fname);
     }
 
@@ -2354 +2359 @@
     mr_free(tmp);
 
-    chdir(bkpinfo->restore_path);   /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
+    if (chdir(bkpinfo->restore_path)) { /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
+        //FIXME
+    }
 
     run_program_and_log_output("pwd", 5);
@@ -2470 +2477 @@
     log_msg(2, "restore_everything() --- starting");
     g_current_media_number = 1;
-    getcwd(cwd, MAX_STR_LEN - 1);
+    if (getcwd(cwd, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
     mr_asprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
     run_program_and_log_output(tmp, FALSE);
@@ -2476 +2485 @@
 
     log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
-    chdir(bkpinfo->restore_path);
-    getcwd(newpath, MAX_STR_LEN - 1);
+    if (chdir(bkpinfo->restore_path)) {
+        //FIXME
+    }
+    if (getcwd(newpath, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
     log_msg(1, "path is now %s", newpath);
     log_msg(1, "restoring everything");
@@ -2511 +2524 @@
         resB = restore_all_biggiefiles_from_CD(filelist);
     }
-    chdir(cwd);
+    if (chdir(cwd)) {
+        //FIXME
+    }
     if (resA + resB) {
         log_to_screen("Errors occurred while data was being restored.");
@@ -2654 +2669 @@
     if (argc == 2 && strcmp(argv[1], "--edit-mountlist") == 0) {
 #ifdef __FreeBSD__
-        system("mv -f /tmp/raidconf.txt /etc/raidtab");
+        paranoid_system("mv -f /tmp/raidconf.txt /etc/raidtab");
         if (!does_file_exist("/etc/raidtab"))
-            system("vinum printconfig > /etc/raidtab");
+            paranoid_system("vinum printconfig > /etc/raidtab");
 #endif
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
         res = let_user_edit_the_mountlist(mountlist, raidlist);
 #ifdef __FreeBSD__
-        system("mv -f /etc/raidtab /tmp/raidconf.txt");
+        paranoid_system("mv -f /etc/raidtab /tmp/raidconf.txt");
 #endif
         paranoid_MR_finish(res);
@@ -2734 +2749 @@
 
     if (argc == 3 && strcmp(argv[1], "--mdconv") == 0) {
-        finish(create_raidtab_from_mdstat(argv[2]));
+        finish(create_raidtab_from_mdstat(MDSTAT_FILE,argv[2]));
     }
 
@@ -2820 +2835 @@
                         mr_asprintf(tmp, "sshfs -o ro %s /tmp/isodir", bkpinfo->netfs_mount);
                     }
-                } else {
-                    if (bkpinfo->netfs_user) {
-                        mr_asprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir", bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                } else  {
+                    if (strstr(bkpinfo->netfs_proto, "smbfs")) {
+                        if (bkpinfo->netfs_user) {
+                            mr_asprintf(tmp, "mount -t cifs %s /tmp/isodir -o user=%s,nolock,ro ", bkpinfo->netfs_mount,bkpinfo->netfs_user);
+                        } else {
+                            mr_asprintf(tmp, "mount -t cifs %s /tmp/isodir -o nolock,ro ", bkpinfo->netfs_mount);
+                        }
                     } else {
-                        mr_asprintf(tmp, "mount %s -o nolock,ro /tmp/isodir", bkpinfo->netfs_mount);
+                        if (bkpinfo->netfs_user) {
+                            mr_asprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir", bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                        } else {
+                            mr_asprintf(tmp, "mount %s -o nolock,ro /tmp/isodir", bkpinfo->netfs_mount);
+                        }
                     }
                 }
@@ -2956 +2979 @@
     if (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL) {
         mr_asprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
-        system(tmp);
+        paranoid_system(tmp);
         mr_free(tmp);
     }