Changeset 2985 in MondoRescue

Timestamp:

Mar 30, 2012, 2:43:48 AM (12 years ago)

Author:

Bruno Cornec

Message:

r4608@localhost: bruno | 2012-03-29 20:28:19 +0200

• Manages grub version at backup time and in the conf file
• Add traces to debug the mdadm UUID issue

Location:

branches/3.0

Files:

• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (4 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (7 diffs)

branches/3.0/mindi/mindi

@@ -1004 +1004 @@
     AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.DEVICE bootloader.device $outfile
     AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.NAME   bootloader.name   $outfile
+    AddFileToCfgIfExists $MINDI_TMP/BOOTLOADER.VER    bootloader.ver   $outfile
     AddFileToCfgIfExists $MINDI_TMP/KEYMAP-LIVES-HERE keymap-lives-here $outfile
     AddFileToCfgIfExists $MINDI_TMP/TAPEDEV-HAS-DATA-DISKS tapedev-has-data-disks $outfile

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

@@ -517 +517 @@
     char *use_star_sz = NULL;
     char *bootldr_str = NULL;
+    char *bootldr_ver = NULL;
     char *tape_device = NULL;
     char *last_filelist_number = NULL;
@@ -705 +706 @@
                 ("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
         }
+        mr_asprintf(&bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version"));
     } else if (bkpinfo->boot_loader == 'E') {
         mr_asprintf(&bootldr_str, "ELILO");
@@ -754 +756 @@
     log_to_screen(tmp);
     mr_free(tmp);
+    if (bootldr_ver != NULL) {
+        mr_asprintf(&tmp, "Boot loader version string: %s", bootldr_ver);
+        log_to_screen(tmp);
+        mr_free(tmp);
+    }
 
     mr_asprintf(&tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir);
@@ -814 +821 @@
     }
     mr_free(bootldr_str);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/BOOTLOADER.VER", bkpinfo->tmpdir);
+    if (write_one_liner_data_file(tmp, bootldr_ver)) {
+        res++;
+        log_msg(1, "%ld: Unable to write one-liner bootloader.ver",
+                __LINE__);
+    }
+    mr_free(bootldr_ver);
     mr_free(tmp);
 

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

@@ -568 +568 @@
   char *bootdevice;
   char *name;
+  char *ver;
 
   malloc_string(bootdevice);
   malloc_string(name);
+  malloc_string(ver);
   
   // leave straight away if raidlist is initial or has no entries
@@ -592 +594 @@
 
   // create device list from normal disks followed by spare ones
-  mr_asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
+  if (raidlist->el[i].data_disks.el[0].device != NULL) {
+    mr_asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
+        log_msg(4, "Adding device %s to list", raidlist->el[i].data_disks.el[0].device);
+  } else {
+    log_msg(1, "Strange, there are entries but no device");
+  }
   for (j = 1; j < raidlist->el[i].data_disks.entries; j++) {
     mr_strcat(devices, " %s", raidlist->el[i].data_disks.el[j].device);
+    log_msg(4, "Adding device %s to list", raidlist->el[i].data_disks.el[j].device);
   }
   for (j = 0; j < raidlist->el[i].spare_disks.entries; j++) {
     mr_strcat(devices, " %s", raidlist->el[i].spare_disks.el[j].device);
+    log_msg(4, "Adding spare device %s to list", raidlist->el[i].spare_disks.el[j].device);
   }
+    log_msg(4, "RAID devices: %s", devices);
   // translate RAID level
   if (raidlist->el[i].raid_level == -2) {
@@ -623 +633 @@
         strcpy(name,"NONE");
     }
+    if (read_cfg_var(g_mondo_cfg_file, "bootloader.ver", ver) != 0) {
+            log_msg(2, "No bootloader.ver param in %s conf file\n", g_mondo_cfg_file);
+        strcpy(ver,"NONE");
+    }
     if (strcmp(name,"GRUB") == 0) {
-        mr_asprintf(&tmp1, "chroot %s grub --version", MNT_RESTORING);
-        mr_asprintf(&tmp, "%s", call_program_and_get_last_line_of_output(tmp1));
-        mr_free(tmp1);
-        if ((strstr(tmp, "GRUB 0.9") != NULL) && (strcmp(raidlist->el[i].raid_device,device) == 0)) {
+        if ((strstr(ver, "GRUB 0.9") != NULL) && (strcmp(raidlist->el[i].raid_device,device) == 0)) {
             mr_asprintf(&oldmd, "-e 0.90");
             log_it("Forcing old metadata 0.90 for md on %s for old GRUB", device);
@@ -641 +652 @@
     mr_free(device);
     mr_free(name);
+    mr_free(ver);
+        log_msg(4, "RAID oldmd: %s", oldmd);
 
   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);
   mr_free(oldmd);
   mr_free(level);
+        log_msg(4, "cmd built: %s", program);
   // Restoring the UUID stored at backup time of present
   for (v = 0; v++ ; v <= raidlist->el[i].additional_vars.entries) {
@@ -659 +673 @@
     }
   }
+        log_msg(4, "cmd built: %s", program);
   if (raidlist->el[i].parity != -1) {
     switch(raidlist->el[i].parity) {
@@ -678 +693 @@
     }
   }
+        log_msg(4, "cmd built: %s", program);
   if (raidlist->el[i].chunk_size != -1) {
     mr_strcat(program, " --chunk=%d", raidlist->el[i].chunk_size);
@@ -684 +700 @@
     mr_strcat(program, " --spare-devices=%d", raidlist->el[i].spare_disks.entries);
   }
+        log_msg(4, "cmd built: %s", program);
   mr_strcat(program, " %s", devices);
     log_msg(2, "RAID device re-created with the following command:\n%s\n", program);