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

Timestamp:

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

Author:

Bruno Cornec

Message:

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

Location:

branches/3.1/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (42 diffs)
• mondo-rstr-compare.c (modified) (12 diffs)
• mondo-rstr-newt.c (modified) (6 diffs)
• mondo-rstr-tools.c (modified) (19 diffs)
• mondoprep.h (modified) (1 diff)
• mondorestore.c (modified) (19 diffs)

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

@@ -110 +110 @@
             popup_and_OK
                 ("I must now reboot. Please leave the boot media in the drive and repeat your actions - e.g. type 'nuke' - and it should work fine.");
-            system("reboot");
+            paranoid_system("reboot");
         }
     }
@@ -171 +171 @@
 
 int do_my_funky_lvm_stuff(bool just_erase_existing_volumes,
-                          bool vacuum_pack)
+                            bool vacuum_pack)
 {
-    /**  buffers **********************************************/
+    /** buffers **********************************************/
     char *tmp = NULL;
     char *tmp1 = NULL;
@@ -188 +188 @@
     char *p;
     char *q;
+    char *r;
 
     /** int ***************************************************/
@@ -442 +443 @@
     /** pointers *********************************************************/
     char *p;
+    char *q;
 
     /** init *************************************************************/
@@ -503 +505 @@
         } else {
             strcpy(new_mountlist->el[new_mountlist->entries].device,
-                   old_mountlist->el[lino].device);
+                     old_mountlist->el[lino].device);
             strcpy(new_mountlist->el[new_mountlist->entries].mountpoint,
-                   old_mountlist->el[lino].mountpoint);
+                     old_mountlist->el[lino].mountpoint);
             strcpy(new_mountlist->el[new_mountlist->entries].format,
-                   old_mountlist->el[lino].format);
+                     old_mountlist->el[lino].format);
             new_mountlist->el[new_mountlist->entries].size =
                 old_mountlist->el[lino].size;
@@ -527 +529 @@
  * @return 0 for success, nonzero for failure.
  */
-int create_raid_device_via_mdadm(struct raidlist_itself *raidlist, char *device)
-{
-  /** int **************************************************************/
-  int i   = 0;
-  int j   = 0;
-  int res = 0;
-  
-  /** buffers ***********************************************************/
-  char *devices = NULL;
-  char *strtmp  = NULL;
-  char *level   = NULL;
-  char *program = NULL;
-  char *tmp = NULL;
-  char *oldmd = NULL;
-  char *bootdevice;
-  char *name;
+int create_raid_device_via_mdadm(struct raidlist_itself *raidlist, char *device, bool test) {
+    /** int **************************************************************/
+    int i   = 0;
+    int j   = 0;
+    int v   = 0;
+    int res = 0;
+    
+    /** buffers ***********************************************************/
+    char *devices = NULL;
+    char *level   = NULL;
+    char *program = NULL;
 
   malloc_string(bootdevice);
@@ -735 +732 @@
             /* format raid partition */
             mr_asprintf(program, "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes", basename(device));
-            system(program);
+            paranoid_system(program);
             if (g_fprep) {
                 fprintf(g_fprep, "%s\n", program);
@@ -752 +749 @@
 
                 mr_asprintf(tmp, "vinum init %s", line);
-                system(tmp);
+                paranoid_system(tmp);
                 mr_free(tmp);
 
@@ -781 +778 @@
         log_to_screen("Initializing RAID device %s", device);
 
-// Shouldn't be necessary.
+        // Shouldn't be necessary.
         log_to_screen("Stopping %s", device);
         stop_raid_device(device);
@@ -789 +786 @@
         log_msg(1, "Making %s", device);
         // use mkraid if it exists, otherwise use mdadm
-        if (run_program_and_log_output("which mkraid", FALSE)) {
-            res = create_raid_device_via_mdadm(raidlist, device);
-            log_msg(1, "Creating RAID device %s via mdadm returned %d", device, res);
+            if (run_program_and_log_output("which mkraid", FALSE)) {
+                res = create_raid_device_via_mdadm(raidlist, device, TRUE);
+                log_msg(1, "Creating RAID device %s via mdadm returned %d", device, res);
         } else {
             mr_asprintf(program, "mkraid --really-force %s", device);
@@ -884 +881 @@
  */
 int format_everything(struct mountlist_itself *mountlist, bool interactively,
-                          struct raidlist_itself *raidlist)
+                            struct raidlist_itself *raidlist)
 {
     /** int **************************************************************/
@@ -907 +904 @@
     log_it("format_everything (mountlist, interactively = %s", (interactively) ? "true" : "false");
 
-    mvaddstr_and_log_it(g_currentY, 0, "Formatting partitions     ");
+    mvaddstr_and_log_it(g_currentY, 0, "Formatting partitions      ");
     open_progress_form("Formatting partitions",
-                       "I am now formatting your hard disk partitions.",
-                       "This may take up to five minutes.", "",
-                       mountlist->entries + 1);
+                         "I am now formatting your hard disk partitions.",
+                         "This may take up to five minutes.", "",
+                         mountlist->entries + 1);
 
     progress_step =
@@ -949 +946 @@
     sleep(2);
 // This last step is probably necessary
-//  log_to_screen("Re-starting software RAIDs...");
-//  start_all_raid_devices(mountlist);
-//  system("sync"); system("sync"); system("sync"); 
-//  sleep(5);
+//  log_to_screen("Re-starting software RAIDs...");
+//  start_all_raid_devices(mountlist);
+//  paranoid_system("sync"); paranoid_system("sync"); paranoid_system("sync"); 
+//  sleep(5);
 // do LVMs now
     log_msg(1, "Creating LVMs");
@@ -992 +989 @@
             continue;
         } else if (!does_file_exist(me->device)
-                   && strncmp(me->device, "/dev/hd", 7)
-                   && strncmp(me->device, "/dev/sd", 7)) {
+                     && strncmp(me->device, "/dev/hd", 7)
+                     && strncmp(me->device, "/dev/sd", 7)) {
             log_it("Not formatting %s yet - doesn't exist - probably an LVM", me->device);
             continue;
@@ -1049 +1046 @@
     }
     newtSuspend();
-    system("clear");
+    paranoid_system("clear");
     newtResume();
     return (retval);
@@ -1064 +1061 @@
  */
 int make_dummy_partitions(FILE * pout_to_fdisk, char *drivename,
-                          int devno_we_must_allow_for)
+                            int devno_we_must_allow_for)
 {
     /** int **************************************************************/
@@ -1178 +1175 @@
     fprintf(f, "\n\n%u partitions:\n", lp->d_npartitions);
     fprintf(f,
-            "#        size   offset    fstype   [fsize bsize bps/cpg]\n");
+            "#        size   offset    fstype   [fsize bsize bps/cpg]\n");
     pp = lp->d_partitions;
     for (i = 0; i < lp->d_npartitions; i++, pp++) {
         if (pp->p_size) {
-            fprintf(f, "  %c: %8lu %8lu  ", 'a' + i, (u_long) pp->p_size,
+            fprintf(f, "    %c: %8lu %8lu  ", 'a' + i, (u_long) pp->p_size,
                     (u_long) pp->p_offset);
             if (pp->p_fstype < FSMAXTYPES)
@@ -1191 +1188 @@
 
             case FS_UNUSED: /* XXX */
-                fprintf(f, "    %5lu %5lu %5.5s ", (u_long) pp->p_fsize,
+                fprintf(f, "      %5lu %5lu %5.5s ", (u_long) pp->p_fsize,
                         (u_long) (pp->p_fsize * pp->p_frag), "");
                 break;
 
             case FS_BSDFFS:
-                fprintf(f, "    %5lu %5lu %5u ", (u_long) pp->p_fsize,
+                fprintf(f, "      %5lu %5lu %5u ", (u_long) pp->p_fsize,
                         (u_long) (pp->p_fsize * pp->p_frag), pp->p_cpg);
                 break;
 
             case FS_BSDLFS:
-                fprintf(f, "    %5lu %5lu %5d", (u_long) pp->p_fsize,
+                fprintf(f, "      %5lu %5lu %5d", (u_long) pp->p_fsize,
                         (u_long) (pp->p_fsize * pp->p_frag), pp->p_cpg);
                 break;
@@ -1217 +1214 @@
             fprintf(f, "- %lu",
                     (u_long) ((pp->p_offset + pp->p_size +
-                               lp->d_secpercyl - 1) / lp->d_secpercyl -
-                              1));
+                                 lp->d_secpercyl - 1) / lp->d_secpercyl -
+                                1));
             if (pp->p_size % lp->d_secpercyl)
                 putc('*', f);
@@ -1256 +1253 @@
     /*
      * Nobody in these enligthened days uses the CHS geometry for
-     * anything, but nontheless try to get it right.  If we fail
+     * anything, but nontheless try to get it right.    If we fail
      * to get any good ideas from the device, construct something
      * which is IBM-PC friendly.
@@ -1340 +1337 @@
                 lp->d_partitions[c - 'a'].p_cpg = 64;
             } else if (!strcasecmp(mountlist->el[idx].format, "raid")
-                       || !strcasecmp(mountlist->el[idx].format, "vinum")) {
+                         || !strcasecmp(mountlist->el[idx].format, "vinum")) {
                 lp->d_partitions[c - 'a'].p_fstype = FS_VINUM;
             } else if (!strcmp(mountlist->el[idx].format, "swap")) {
@@ -1422 +1419 @@
     char *format = NULL;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *tmp1 = NULL;
 
@@ -1511 +1509 @@
 
         /* OK, we've found partition /dev/hdxN in mountlist; let's prep it */
-        /* For FreeBSD, that is      /dev/adXsY */
+        /* For FreeBSD, that is     /dev/adXsY */
 
         log_it("Found partition %s in mountlist", device_str);
@@ -1540 +1538 @@
                 previous_devno =
                     make_dummy_partitions(pout_to_fdisk, drivename,
-                                          current_devno);
+                                            current_devno);
             }
         }
@@ -1595 +1593 @@
         sync();
         paranoid_pclose(pout_to_fdisk);
-        log_msg(0,
-                "------------------- fdisk.log looks like this ------------------");
+        paranoid_system("sync");
+        log_msg(0,"------------------- fdisk.log looks like this ------------------");
         mr_asprintf(tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
         system(tmp);
@@ -1625 +1623 @@
  * Create partition number @p partno on @p drive with @p fdisk.
  * @param drive The drive to create the partition on.
-//  * @param partno The partition number of the new partition (1-4 are primary, >=5 is logical).
+//  * @param partno The partition number of the new partition (1-4 are primary, >=5 is logical).
  * @param prev_partno The partition number of the most recently prepped partition.
  * @param format The filesystem type of this partition (used to set the type).
@@ -1656 +1654 @@
 
     log_it("partition_device('%s', %d, %d, '%s', %lld) --- starting",
-           drive, partno, prev_partno, format, partsize);
+             drive, partno, prev_partno, format, partsize);
 
     if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
@@ -1743 +1741 @@
             retval =
                 set_partition_type(pout_to_fdisk, drive, partno, format,
-                                   partsize);
+                                     partsize);
             if (retval) {
                 log_msg(1, "Failed. Trying again...");
                 retval =
                     set_partition_type(pout_to_fdisk, drive, partno,
-                                       format, partsize);
+                                         format, partsize);
             }
         }
@@ -1783 +1781 @@
             retval =
                 set_partition_type(pout_to_fdisk, drive, partno, format,
-                                   partsize);
+                                     partsize);
             if (retval) {
                 log_it("Partitioned %s but failed to set its type", partition_name);
@@ -1832 +1830 @@
     /** buffer *********************************************************/
     struct list_of_disks *drivelist;
-    /*  struct mountlist_itself new_mtlist, *mountlist; */
+    /*  struct mountlist_itself new_mtlist, *mountlist; */
 
     /** end ************************************************************/
@@ -1840 +1838 @@
 
     log_it("partition_everything() --- starting");
-    mvaddstr_and_log_it(g_currentY, 0, "Partitioning hard drives      ");
-    /*  mountlist=orig_mtlist; */
+    mvaddstr_and_log_it(g_currentY, 0, "Partitioning hard drives        ");
+    /*  mountlist=orig_mtlist; */
     if (mountlist_contains_raid_devices(mountlist)) {
-        /*      mountlist=&new_mtlist; */
-        /*      extrapolate_mountlist_to_include_raid_partitions(mountlist,orig_mtlist); */
+        /*      mountlist=&new_mtlist; */
+        /*      extrapolate_mountlist_to_include_raid_partitions(mountlist,orig_mtlist); */
         log_msg(0,
                 "Mountlist, including the partitions incorporated in RAID devices:-");
@@ -1865 +1863 @@
 
     open_progress_form("Partitioning devices",
-                       "I am now going to partition all your drives.",
-                       "This should not take more than five minutes.", "",
-                       mountlist->entries);
+                         "I am now going to partition all your drives.",
+                         "This should not take more than five minutes.", "",
+                         mountlist->entries);
 
     make_list_of_drives_in_mountlist(mountlist, drivelist);
@@ -1885 +1883 @@
     }
     newtSuspend();
-    system("clear");
+    paranoid_system("clear");
     newtResume();
     paranoid_free(drivelist);
@@ -1906 +1904 @@
  */
 int set_partition_type(FILE * pout_to_fdisk, const char *drive, int partno,
-                       const char *format, long long partsize)
+                         const char *format, long long partsize)
 {
     /** buffers *********************************************************/
@@ -1939 +1937 @@
         }
     } else if (strcmp(format, "ext2") == 0
-               || strcmp(format, "reiserfs") == 0
-               || strcmp(format, "ext3") == 0 
-               || strcmp(format, "ext4") == 0 
-               || strcmp(format, "xfs") == 0
-               || strcmp(format, "jfs") == 0) {
+                 || strcmp(format, "reiserfs") == 0
+                 || strcmp(format, "ext3") == 0 
+                 || strcmp(format, "ext4") == 0 
+                 || strcmp(format, "xfs") == 0
+                 || strcmp(format, "jfs") == 0
+                     || strcmp(format, "btrfs") == 0) {
         mr_asprintf(partcode, "83");
     } else if (strcmp(format, "minix") == 0) {
@@ -1956 +1955 @@
         mr_asprintf(partcode, "7");
     } else if ((strcmp(format, "ufs") == 0)
-               || (strcmp(format, "ffs") == 0)) {   /* raid autodetect */
+                 || (strcmp(format, "ffs") == 0)) { /* raid autodetect */
         mr_asprintf(partcode, "a5");
     } else if (strcmp(format, "lvm") == 0) {
@@ -2108 +2107 @@
     mr_asprintf(program, "vinum stop -f %s", raid_device);
 #else
-    // use raidstop if it exists, otherwise use mdadm
-    if (run_program_and_log_output("which raidstop", FALSE)) {
+        // use raidstop if it exists, otherwise use mdadm
+        if (run_program_and_log_output("which raidstop", FALSE)) {
         mr_asprintf(program, "mdadm -S %s", raid_device);
     } else {
@@ -2174 +2173 @@
     /** pointers ********************************************************/
     FILE *fin;
+    char *q;
     int i;
 
@@ -2203 +2203 @@
                 for (p = dev; *p > 32; p++);
                 *p = '\0';
-                res = stop_raid_device(dev);
+                retval += stop_raid_device(dev);
                 mr_free(dev);
             }
@@ -2261 +2261 @@
     } else if (strcmp(format, "ext4") == 0) {
         mr_asprintf(program, "mkfs -t ext4 -F -q");
+    } else if (strcmp(format, "btrfs") == 0) {
+              strcpy(program, "mkfs.btrfs");
     } else if (strcmp(format, "minix") == 0) {
         mr_asprintf(program, "mkfs.minix");
@@ -2297 +2299 @@
  * There are a few problems with this function:
  * - It won't work if there was any unallocated space on the user's hard drive
- *   when it was backed up.
+ *   when it was backed up.
  * - It won't work if the user's hard drive lies about its size (more common
- *   than you'd think).
+ *   than you'd think).
  *
  * @param mountlist The mountlist to use for resizing @p drive_name.
@@ -2311 +2313 @@
     /** int *************************************************************/
     int partno, lastpart;
-               /** remove driveno, noof_drives stan benoit apr 2002**/
 
     /** float ***********************************************************/

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

@@ -71 +71 @@
         return (1);
     }
-    fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin);
+    if (fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin)) {
+        // FIXME
+    }
     paranoid_fclose(fin);
 
@@ -218 +220 @@
     int retval = 0;
     int res;
-    long noof_lines;
     long archiver_errors;
     bool use_star;
@@ -289 +290 @@
     if (use_star) {
         // doesn't use compressor_exe
-        mr_asprintf(command, "%s -diff H=exustar file=%s >> %s 2>> %s", archiver_exe, tarball_fname, logfile, logfile);
+        mr_asprintf(command, "%s -sparse -diff H=exustar file=%s >> %s 2>> %s", archiver_exe, tarball_fname, logfile, logfile);
     } else {
         mr_asprintf(command, "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s", archiver_exe, TAPE_BLOCK_SIZE, BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);
@@ -308 +309 @@
     if (length_of_file(logfile) > 5) {
         mr_asprintf(command, "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MONDO_CACHE"/changed.txt", logfile);
-        system(command);
+        paranoid_system(command);
         mr_free(command);
 
@@ -337 +338 @@
 {
     int retval = 0;
-    int res;
     int current_tarball_number = 0;
 
@@ -409 +409 @@
             log_to_screen(progress_str);
         } else {
-            res = compare_a_tarball(tarball_fname, current_tarball_number);
+            retval += compare_a_tarball(tarball_fname, current_tarball_number);
 
             g_current_progress++;
@@ -459 +459 @@
     assert(bkpinfo != NULL);
 
-    getcwd(cwd, MAX_STR_LEN - 1);
-    chdir(bkpinfo->restore_path);
-    getcwd(new, MAX_STR_LEN - 1);
+    if (getcwd(cwd, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->restore_path)) {
+        //FIXME
+    }
+    if (getcwd(new, MAX_STR_LEN - 1)) {
+        // FIXME
+    }
     insist_on_this_cd_number(g_current_media_number);
     unlink(MONDO_CACHE"/changed.txt");
@@ -467 +473 @@
     resA = compare_all_tarballs();
     resB = compare_all_biggiefiles();
-    chdir(cwd);
+    if (chdir(cwd)) {
+        // FIXME
+    }
     noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt");
     if (noof_changed_files) {
@@ -594 +602 @@
 
             log_msg(2, "calling popup_changelist_from_file()");
-            getcwd(cwd, MAX_STR_LEN - 1);
-            chdir(bkpinfo->restore_path);
-            getcwd(new, MAX_STR_LEN - 1);
+            if (getcwd(cwd, MAX_STR_LEN - 1)) {
+                //FIXME
+            }
+            if (chdir(bkpinfo->restore_path)) {
+                // FIXME
+            }
+            if (getcwd(new, MAX_STR_LEN - 1)) {
+                //FIXME
+            }
             popup_changelist_from_file(MONDO_CACHE"/changed.files");
-            chdir(cwd);
+            if (chdir(cwd)) {
+                // FIXME
+            }
             log_msg(2, "Returning from popup_changelist_from_file()");
         }
@@ -634 +650 @@
     assert(bkpinfo != NULL);
     malloc_string(dir);
-    getcwd(dir, MAX_STR_LEN);
-    chdir(bkpinfo->restore_path);
+    if (getcwd(dir, MAX_STR_LEN)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->restore_path)) {
+        // FIXME
+    }
 
     mvaddstr_and_log_it(g_currentY,
@@ -647 +667 @@
     }
     res = verify_tape_backups();
-    chdir(dir);
+    if (chdir(dir)) {
+        // FIXME
+    }
     if (length_of_file(MONDO_CACHE"/changed.txt") > 2
         && length_of_file(MONDO_CACHE"/changed.files") > 2) {
@@ -686 +708 @@
     malloc_string(dir);
 
-    getcwd(dir, MAX_STR_LEN);
-    chdir(bkpinfo->restore_path);
+    if (getcwd(dir, MAX_STR_LEN)) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->restore_path)) {
+        // FIXME
+    }
 
     mvaddstr_and_log_it(g_currentY,
                         0, "Verifying archives against filesystem");
     res = verify_tape_backups();
-    chdir(dir);
+    if (chdir(dir)) {
+        // FIXME
+    }
     if (res) {
         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");

branches/3.1/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -137 +137 @@
     /** int **************************************************************/
     int i = 0;
-    int num_to_add = 0;
 
     /** newt *************************************************************/
@@ -233 +232 @@
     mr_asprintf(drive_to_add, "%s", device_str);
     for (i = strlen(drive_to_add); isdigit(drive_to_add[i - 1]); i--);
-    num_to_add = atoi(drive_to_add + i);
     mr_free(drive_to_add);
 
@@ -1943 +1941 @@
         finish(1);
     }
-    newtPushHelpLine
-        ("   Please edit the mountlist to your satisfaction, then click OK or Cancel.");
+    newtPushHelpLine("WARNING: No LVM modification possible here. Edit /tmp/i-want-my-lvm instead");
     i = 4;
     bAdd = newtCompactButton(i, 17, " Add ");
@@ -2423 +2420 @@
     newtComponent b2;
     newtComponent b3;
-    newtComponent b_res;
 
 
@@ -2434 +2430 @@
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, b1, b2, b3, NULL);
-    b_res = newtRunForm(myForm);
     newtFormDestroy(myForm);
     newtPopWindow();
@@ -2886 +2881 @@
             mr_getline(tmp, stdin);
             output = tmp[0];
-            free(tmp);
+            mr_free(tmp);
         }
         return (output);

branches/3.1/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -80 +80 @@
 char *incoming = NULL;
 char *question = NULL;
+char *q;
 
 assert_string_is_neither_NULL_nor_zerolength(infname);
@@ -209 +210 @@
 if (is_this_device_mounted(g_isodir_device)) {
     log_to_screen("WARNING - isodir is already mounted");
-    already_mounted = TRUE;
 } else {
     mr_asprintf(mount_isodir_command, "mount %s", g_isodir_device);
@@ -1082 +1082 @@
 char *tmp;
 char *tmp1 = NULL;
+char *q;
 int res = 0;
 pid_t pid;
@@ -1088 +1089 @@
 malloc_string(tmp);
 
-    getcwd(tmp, MAX_STR_LEN);
-    chdir(bkpinfo->tmpdir);
+    if (getcwd(tmp, MAX_STR_LEN) == NULL) {
+        // FIXME
+    }
+    if (chdir(bkpinfo->tmpdir)) {
+        // FIXME
+    }
     log_msg(1, "chdir(%s)", bkpinfo->tmpdir);
     log_to_screen("Extracting filelist and biggielist from media...");
@@ -1116 +1121 @@
         }
     }
-    chdir(tmp);
+    if (chdir(tmp)) {
+        // FIXME
+    }
 
     log_msg(2, "Forking");
@@ -1147 +1154 @@
     unlink(MINDI_CACHE"/filelist.full.gz");
     if (g_text_mode) {
-        printf("Restore which directory? --> ");
-        mr_getline(tmp1, stdin);
-        toggle_path_selection(filelist, tmp1, TRUE);
-        if (strlen(tmp1) == 0) {
+        q = NULL;
+        while (q == NULL) {
+            printf("Restore which directory? --> ");
+            mr_getline(q, stdin);
+        }
+        toggle_path_selection(filelist, q, TRUE);
+        if (strlen(q) == 0) {
             res = 1;
         } else {
             res = 0;
         }
-        mr_free(tmp1);
+        mr_free(q);
     } else {
         res = edit_filelist(filelist);
@@ -1229 +1239 @@
             newtSuspend();
         }
-        (void)system("chroot " MNT_RESTORING);
+        paranoid_system("chroot " MNT_RESTORING);
         if (!g_text_mode) {
             newtResume();
@@ -1271 +1281 @@
     backup_crucial_file(MNT_RESTORING, "/boot/grub/menu.lst");
     backup_crucial_file(MNT_RESTORING, "/boot/grub/grub.cfg");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub2/grub.cfg");
     backup_crucial_file(MNT_RESTORING, "/etc/lilo.conf");
     backup_crucial_file(MNT_RESTORING, "/etc/elilo.conf");
     backup_crucial_file(MNT_RESTORING, "/boot/grub/device.map");
+    backup_crucial_file(MNT_RESTORING, "/boot/grub2/device.map");
     backup_crucial_file(MNT_RESTORING, "/etc/mtab");
     device = read_cfg_var(MINDI_CACHE"/mondorestore.cfg", "bootloader.device");
@@ -1385 +1397 @@
     char *p = NULL;
 
-    int res = 0;
     bool done;
+    int res = 0;        /*  FALSE */
+    bool mntlistchg = FALSE;
+    FILE *fin = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(bd);
@@ -1397 +1411 @@
                             0,
                             "Modifying fstab, mtab, device.map and menu.lst/grub.cfg, and running GRUB...                             ");
+        /*  Did we changed the mountlist ? If yes, then force editing conf files */
+        if ((fin = fopen(MONDO_MNTLISTCHG, "r")) != NULL) {
+            mntlistchg = TRUE;
+        }
         for (done = FALSE; !done;) {
             p = popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device);
@@ -1406 +1424 @@
                 continue;
             }
-            mr_asprintf(command, "stabgrub-me %s", p);
-            mr_free(p);
-
-            res = run_program_and_log_output(command, 1);
-            mr_free(command);
-
-            if (res) {
+            /*  Only try to adapt grub here first if the mountlist wasn't changed before */
+            if (! mntlistchg) {
+                mr_asprintf(command, "stabgrub-me %s", p);
+                mr_free(p);
+
+                res = run_program_and_log_output(command, 1);
+                mr_free(command);
+            }
+
+            if ((res) || (mntlistchg)){
                 popup_and_OK
                     ("GRUB installation failed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
+                } else {
+                    popup_and_OK("The mountlist was changed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
+                }
                 if (!g_text_mode) {
                     newtSuspend();
@@ -1426 +1450 @@
                 } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
                     sprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub2/grub.cfg")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub2/grub.cfg", MNT_RESTORING, editor);
                 }
                 paranoid_system(tmp);
-                sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+                if (does_file_exist(MNT_RESTORING"/boot/grub/device.map")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub2/device.map")) {
+                    sprintf(tmp, "chroot %s %s /boot/grub2/device.map", MNT_RESTORING, editor);
+                                }
                 paranoid_system(tmp);
                 if (!g_text_mode) {
@@ -1439 +1469 @@
                         ("GRUB installation failed. Please fix the conf files so that a manual install using 'grub-install' or similar command works. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
                     newtSuspend();
-                    system("chroot " MNT_RESTORING);
+                    paranoid_system("chroot " MNT_RESTORING);
                     newtResume();
                     popup_and_OK("Thank you.");
@@ -1501 +1531 @@
                 ("Because of bugs in GRUB's own installer, GRUB was not installed properly. Please install the boot loader manually now, using this chroot()'ed shell prompt. Type 'exit' when you have finished.");
             newtSuspend();
-            system("chroot " MNT_RESTORING);
+            paranoid_system("chroot " MNT_RESTORING);
             newtResume();
             popup_and_OK("Thank you.");
@@ -1846 +1876 @@
     FILE *fout;
     char *incoming = NULL;
+    char *q;
 
     assert_string_is_neither_NULL_nor_zerolength(output_file);
@@ -1935 +1966 @@
                        "in preparation for the post-restoration reboot.",
                        "", mountlist->entries);
-    chdir("/");
+    if (chdir("/")) {
+        // FIXME
+    }
     for (i = 0;
          i < 10
@@ -2032 +2065 @@
 /* @} - end restoreUtilityGroup */
 
-void wait_until_software_raids_are_prepped(char *mdstat_file,
-                                           int wait_for_percentage)
+void wait_until_software_raids_are_prepped(char *mdstat_file, int wait_for_percentage)
 {
     struct raidlist_itself *raidlist;
-    int unfinished_mdstat_devices = 9999, i;
+    int unfinished_mdstat_devices = 9999;
+    int i = 0;
     char *screen_message = NULL;
 
@@ -2045 +2078 @@
     while (unfinished_mdstat_devices > 0) {
             // FIXME: Prefix '/dev/' should really be dynamic!
-        if (parse_mdstat(raidlist, "/dev/")) {
+        if (parse_mdstat(MDSTAT_FILE, raidlist, "/dev/")) {
             log_to_screen("Sorry, cannot read %s", MDSTAT_FILE);
             log_msg(1,"Sorry, cannot read %s", MDSTAT_FILE);
             return;
         }
-        for (unfinished_mdstat_devices = i = 0; i <= raidlist->entries; i++) {
+        for (unfinished_mdstat_devices = 0; i <= raidlist->entries; i++) {
             if (raidlist->el[i].progress < wait_for_percentage) {
                 unfinished_mdstat_devices++;
@@ -2067 +2100 @@
                     sleep(2);
                     // FIXME: Prefix '/dev/' should really be dynamic!
-                    if (parse_mdstat(raidlist, "/dev/")) {
+                    if (parse_mdstat(MDSTAT_FILE, raidlist, "/dev/")) {
                         break;
                     }

branches/3.1/mondo/src/mondorestore/mondoprep.h

@@ -82 +82 @@
 
 
-char *truncate_to_drive_name(char *partition);
+char *truncate_to_drive_name(const char *partition);
 void create_mountlist_for_drive(struct mountlist_itself *mountlist,
                                 char *drive_name,

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);
     }