Changeset 3397 in MondoRescue

Timestamp:

Aug 4, 2015, 8:57:22 AM (10 years ago)

Author:

Bruno Cornec

Message:

Adds a boot-type config option

It's filled by mondoarchive, passed to mindi as new 23rd param and
stored in the config file. It's also now read at restore time. No
exploitation of this parameter is done yet.
Remains also to prepare a correct bootable device for restoration
(currently ia64 == EFI we should manage the boot loader separately from
the boot type and from the boot env of the DR media)

Location:

branches/3.2

Files:

• mindi/mindi (modified) (2 diffs)
• mondo/src/common/libmondo-archive.c (modified) (4 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/3.2/mindi/mindi

@@ -959 +959 @@
     echo "use-lzma $use_lzma" >> $outfile
     echo "use-comp $use_comp" >> $outfile
+    echo "boot-type $BOOT_TYPE" >> $outfile
     echo "datestamp `date`" >> $outfile
     [ "$ESTIMATED_TOTAL_NOOF_SLICES" ] && echo "total-slices $ESTIMATED_TOTAL_NOOF_SLICES" >> $outfile
@@ -3231 +3232 @@
         USE_LZMA="${21}"
         NOT_BOOT="${22}"
+        BOOT_TYPE="${23}"
         [ "$USE_COMP" = "" ] && USE_COMP=yes
         [ "$USE_GZIP" = "" ] && USE_GZIP=no

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

@@ -496 +496 @@
     char *bootldr_str = NULL;
     char *bootldr_ver = NULL;
+    char *boot_type = NULL;
     char *tape_device = NULL;
     char *last_filelist_number = NULL;
@@ -591 +592 @@
     } else {
         mr_asprintf(use_lilo_sz, "no");
+    }
+    if (bkpinfo->boot_type == UEFI) {
+        mr_asprintf(boot_type, "UEFI");
+    } else if (bkpinfo->boot_type == EFI) {
+        mr_asprintf(boot_type, "EFI");
+    } else if (bkpinfo->boot_type == BIOS) {
+        mr_asprintf(boot_type, "BIOS");
+    } else {
+        mr_asprintf(boot_type, "UNKNOWN");
     }
 
@@ -856 +866 @@
             use_lzma_sz,        // parameter #21 (STRING)
             value,          // parameter #22 (STRING)
+            boot_type,      // parameter #23 (STRING)
             MONDO_LOGFILE       // redirect to log file
             );
@@ -863 +874 @@
     mr_free(tape_size_sz);
     mr_free(use_lzo_sz);
+    mr_free(boot_type);
     mr_free(cd_recovery_sz);
     mr_free(broken_bios_sz);

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

@@ -834 +834 @@
 }
 
+/* BCO: Read here the boot_* variables */
+read_cfg_var(cfg_file, "boot-type", value);
+if (!strcmp(value, "BIOS")) {
+    bkpinfo->boot_type = BIOS;
+} else if (!strcmp(value, "EFI")) {
+    bkpinfo->boot_type = EFI;
+} else if (!strcmp(value, "UEFI")) {
+    bkpinfo->boot_type = UEFI;
+} else {
+    log_msg(1, "No known boot type found");
+}
+log_msg(1, "Found %s boot type",value);
+
 if (bkpinfo->backup_media_type == netfs) {
     if (!cfgf) {