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

Timestamp:

Jun 25, 2013, 10:53:14 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Apply fixes to 3.1 tree so that at least mondo compiles again (but that branch probably doesn't work at all again).

Location:

branches/3.1/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (18 diffs)
• mondo-rstr-compare.c (modified) (2 diffs)
• mondo-rstr-newt.c (modified) (2 diffs)
• mondo-rstr-tools.c (modified) (8 diffs)
• mondorestore.c (modified) (2 diffs)

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

@@ -188 +188 @@
     char *p;
     char *q;
-    char *r;
 
     /** int ***************************************************/
@@ -391 +390 @@
         }
         mr_asprintf(tmp1, "echo \"%s\" >> /tmp/out.sh", command);
-        system(tmp1);
+        if (system(tmp1)) {
+            //FIXME
+        }
         mr_free(tmp1);
         sleep(1);
@@ -443 +444 @@
     /** pointers *********************************************************/
     char *p;
-    char *q;
 
     /** init *************************************************************/
@@ -533 +533 @@
     int i   = 0;
     int j   = 0;
-    int v   = 0;
     int res = 0;
     
@@ -540 +539 @@
     char *level   = NULL;
     char *program = NULL;
-
-  malloc_string(bootdevice);
-  malloc_string(name);
-  
+    char *strtmp = NULL;
+    char *oldmd = NULL;
+
   // leave straight away if raidlist is initial or has no entries
   if (!raidlist || raidlist->entries == 0) {
@@ -587 +585 @@
   // - faulty devices ignored
   // - persistent superblock always used as this is recommended
-  // As per bug #473, the parameter "-e 0.90" is used only when:
-  //   1) It detects that system boots from Raid-1
-  //   2) grub bootloader < v1 is used.
-  // Otherwise it won't boot which is bad.
-    read_cfg_var(g_mondo_cfg_file, "bootloader.device", bootdevice);
-    read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-    if (strcmp(name,"GRUB") == 0) {
-        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("grub --version"));
-        if ((strstr(tmp, "GRUB 0.9") != NULL) && (strcmp(raidlist->el[i].raid_device,device) == 0)) {
-            mr_free(oldmd);
-            mr_asprintf(oldmd, "-e 0.90");
-            log_it("Forcing old metadata 0.90 for md on %s for old GRUB", device);
-        }
-    } else if ((strcmp(name,"LILO") == 0) && (strcmp(raidlist->el[i].raid_device,device) == 0)) {
-        mr_free(oldmd);
-        mr_asprintf(oldmd, "-e 0.90");
-        log_it("Forcing old metadata 0.90 for md on %s for LILO", device);
-    } else {
-        mr_asprintf(oldmd, "");
-    }
-    mr_free(device);
-    mr_free(name);
 
   mr_asprintf(program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d %s", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries, oldmd);
@@ -632 +608 @@
       break;
     }
-    paranoid_free(strtmp);
+    mr_free(strtmp);
   }
   if (raidlist->el[i].chunk_size != -1) {
@@ -1039 +1015 @@
                 sync();
                 sync();
-                system("reboot");
+                if (system("reboot")) {
+                    // FIXME
+                }
             }
         } else {
@@ -1420 +1398 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
-    char *tmp1 = NULL;
-    char *tmp1 = NULL;
 
     /** end *************************************************************/
@@ -1594 +1570 @@
         sync();
         paranoid_pclose(pout_to_fdisk);
-        paranoid_system("sync");
+        sync();
         log_msg(0,"------------------- fdisk.log looks like this ------------------");
         mr_asprintf(tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
-        system(tmp);
+        if (system(tmp)) {
+            // FIXME
+        }
         mr_free(tmp);
 
@@ -1645 +1623 @@
 
     /** pointers **********************************************************/
-    char *p;
     char *part_table_fmt = NULL;
     FILE *fout;
@@ -1676 +1653 @@
         return (1);
     }
-
-
-    p = (char *) strrchr(partition_name, '/');
 
     /* BERLIOS: should not be called each time */
@@ -1916 +1890 @@
 
     /** pointers *********************************************************/
-    char *p;
     FILE *fout;
 
@@ -1928 +1901 @@
 
     partition = build_partition_name(drive, partno);
-    p = (char *) strrchr(partition, '/');
     if (strcmp(format, "swap") == 0) {
         mr_asprintf(partcode, "82");
@@ -2169 +2141 @@
     char *dev;
     char *p;
-    int res;
 #endif
 
     /** pointers ********************************************************/
     FILE *fin;
-    char *q;
     int i;
 
@@ -2233 +2203 @@
 char *which_format_command_do_i_need(char *format)
 {
-    /** int *************************************************************/
-    int res = 0;
-
     /** buffers *********************************************************/
     char *program = NULL;
@@ -2292 +2259 @@
 #endif
         log_it("Unknown format (%s) - assuming '%s' will do", format, program);
-        res = 0;
     }
     return (program);
@@ -2320 +2286 @@
     float factor;
     long long new_size;
+    char *tmp = NULL;
 
     /** long *************************************************************/

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

@@ -228 +228 @@
     char *archiver_exe = NULL;
     char *tmp1 = NULL;
-    char *filelist_name = NULL;
     char *logfile = NULL;
     char *compressor_exe = NULL;
@@ -234 +233 @@
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    mr_asprintf(filelist_name, MNT_CDROM "/archives/filelist.%d", current_tarball_number);
-    noof_lines = count_lines_in_file(filelist_name);
-    mr_free(filelist_name);
 
     if (strstr(tarball_fname, ".bz2")) {

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

@@ -531 +531 @@
     assert(raidrec != NULL);
 
-    system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
+    if (system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null")) {
+        // FIXME
+    }
     personalities = last_line_of_file("/tmp/raid-personalities.txt");
     mr_asprintf(prompt, "Please enter the RAID level you want. %s", personalities);
@@ -2272 +2274 @@
     char *q = NULL;
     char *r = NULL;
-    char *s = NULL;
     char *idev = NULL;
     bool ret = FALSE;       /* Should be false by default, and modfiy if conditions respected */

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

@@ -80 +80 @@
 char *incoming = NULL;
 char *question = NULL;
-char *q;
-char *q;
 
 assert_string_is_neither_NULL_nor_zerolength(infname);
@@ -182 +180 @@
     char *mds = NULL;
     int retval = 0, i;
-    bool already_mounted = FALSE;
     char *isodir_format = NULL;
 
@@ -553 +550 @@
     mr_free(command);
 
-    chdir(bkpinfo->tmpdir);
+    if (chdir(bkpinfo->tmpdir)) {
+        //FIXME
+    }
 
     mr_free(mountpt);
@@ -576 +575 @@
         if (try_plan_B) {
             log_msg(2, "gcffa --- OK, switching to Plan B");
-            chdir(bkpinfo->tmpdir);
+            if (chdir(bkpinfo->tmpdir)) {
+                // FIXME
+            }
             run_program_and_log_output("mkdir -p tmp", FALSE);
 
@@ -1082 +1083 @@
 char *command = NULL;
 char *tmp;
-char *tmp1 = NULL;
 char *q;
 int res = 0;
@@ -1402 +1402 @@
     bool mntlistchg = FALSE;
     FILE *fin = NULL;
-    bool mntlistchg = FALSE;
-    FILE *fin = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(bd);
@@ -1436 +1434 @@
             }
 
-            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();
-                }
-                sprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
-                paranoid_system(tmp);
-                sprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
-                paranoid_system(tmp);
-                if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
-                    sprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
-                } 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);
-                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) {
-                    newtResume();
-                }
-                sprintf(command, "stabgrub-me %s", boot_device);
-                res = run_program_and_log_output(command, 1);
-                if (res) {
-                    popup_and_OK
-                        ("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();
-                    paranoid_system("chroot " MNT_RESTORING);
-                    newtResume();
-                    popup_and_OK("Thank you.");
-                } else {
-                    popup_and_OK("GRUB is now installed correctly");
-                    done = TRUE;
-                }
+            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();
+            }
+            mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+            paranoid_system(tmp);
+            mr_free(tmp);
+
+            mr_asprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
+            paranoid_system(tmp);
+            mr_free(tmp);
+
+            if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+            } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+            } else if (does_file_exist(MNT_RESTORING"/boot/grub2/grub.cfg")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub2/grub.cfg", MNT_RESTORING, editor);
+            }
+            paranoid_system(tmp);
+            mr_free(tmp);
+
+            if (does_file_exist(MNT_RESTORING"/boot/grub/device.map")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+            } else if (does_file_exist(MNT_RESTORING"/boot/grub2/device.map")) {
+                mr_asprintf(tmp, "chroot %s %s /boot/grub2/device.map", MNT_RESTORING, editor);
+            }
+            paranoid_system(tmp);
+            mr_free(tmp);
+
+            if (!g_text_mode) {
+                newtResume();
+            }
+            mr_asprintf(command, "stabgrub-me %s", boot_device);
+            res = run_program_and_log_output(command, 1);
+            mr_free(command);
+            if (res) {
+                popup_and_OK("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();
+                paranoid_system("chroot " MNT_RESTORING);
+                newtResume();
+                popup_and_OK("Thank you.");
+            } else {
+                popup_and_OK("GRUB is now installed correctly");
                 done = TRUE;
             }
@@ -1879 +1881 @@
     FILE *fout;
     char *incoming = NULL;
-    char *q;
-    char *q;
 
     assert_string_is_neither_NULL_nor_zerolength(output_file);

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

@@ -1230 +1230 @@
 
     if (strcmp(outfile_fname, "/dev/null")) {
-        chown(outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid);
+        if (chown(outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid)) {
+            // FIXME
+        }
         chmod(outfile_fname, biggiestruct.properties.st_mode);
         ubuf->actime = biggiestruct.properties.st_atime;
@@ -1475 +1477 @@
     if (strcmp(outfile_fname, "/dev/null")) {
         chmod(outfile_fname, biggiestruct.properties.st_mode);
-        chown(outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid);
+        if (chown(outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid)) {
+            // FIXME
+        }
         ubuf->actime = biggiestruct.properties.st_atime;
         ubuf->modtime = biggiestruct.properties.st_mtime;