Changeset 1671 in MondoRescue

Timestamp:

Oct 1, 2007, 2:12:54 PM (17 years ago)

Author:

Bruno Cornec

Message:

handle 2 new conf file parameters

Location:

branches/stable

Files:

• mindi/mindi (modified) (1 diff)
• mondo-web/mondo-web.pl (modified) (1 diff)
• mondo/distributions/conf/mondo.conf.dist (modified) (2 diffs)
• mondo/src/common/libmondo-archive.c (modified) (8 diffs)
• mondo/src/common/libmondo-tools.c (modified) (1 diff)

branches/stable/mindi/mindi

@@ -100 +100 @@
 CDROM_MODS="$TAPE_MODS $IDE_MODS $mindi_cdrom_mods $USB_MODS $PCMCIA_MODS"
 NET_MODS="$mindi_net_mods"
+# BERLIOS: Handle the case where all is passed (cloning mode)
 EXTRA_MODS="$CDROM_MODS $mindi_extra_mods $mindi_additional_mods"
 DENY_MODS="$mindi_deny_mods"

branches/stable/mondo-web/mondo-web.pl

@@ -97 +97 @@
         'ELILO' => "ELILO (ia64)",
         'RAW' => "RAW",
+        'BOOT0' => "BOOT0 (FreeBSD)",
+        'DD' => "DD (FreeBSD)",
         'NATIVE' => "Autodetected",
 );

branches/stable/mondo/distributions/conf/mondo.conf.dist

@@ -91 +91 @@
 #mondorescue_kernel="/boot/vmlinuz.special"
 
-# DONE
 #
 # Additional modules to support 
@@ -100 +99 @@
 #
 # Boot loader to use
-# (GRUB|ELILO|LILO|RAW|NATIVE)
+# (GRUB|ELILO|LILO|RAW|BOOT0|DD|NATIVE)
 #
 mondo_boot_loader="NATIVE"
 
+# DONE
 #
 # Differential backup or full (yes|no)

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

@@ -558 +558 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(bootldr_str);
     malloc_string(last_filelist_number);
     malloc_string(devs_to_exclude);
@@ -669 +668 @@
     }
     if (bkpinfo->boot_loader == 'L') {
-        strcpy(bootldr_str, "LILO");
+        mr_asprintf(&bootldr_str, "LILO");
         if (!does_file_exist("/etc/lilo.conf")) {
             fatal_error
@@ -675 +674 @@
         }
     } else if (bkpinfo->boot_loader == 'G') {
-        strcpy(bootldr_str, "GRUB");
+        mr_asprintf(&bootldr_str, "GRUB");
         if (!does_file_exist("/etc/grub.conf")
             && does_file_exist("/boot/grub/grub.conf")) {
@@ -692 +691 @@
         }
     } else if (bkpinfo->boot_loader == 'E') {
-        strcpy(bootldr_str, "ELILO");
+        mr_asprintf(&bootldr_str, "ELILO");
         /* BERLIOS: fix it for Debian, Mandrake, ... */
         if (!does_file_exist("/etc/elilo.conf")
@@ -723 +722 @@
         }
     } else if (bkpinfo->boot_loader == 'R') {
-        strcpy(bootldr_str, "RAW");
+        mr_asprintf(&bootldr_str, "RAW");
     }
 #ifdef __FreeBSD__
     else if (bkpinfo->boot_loader == 'D') {
-        strcpy(bootldr_str, "DD");
+        mr_asprintf(&bootldr_str, "DD");
     }
 
     else if (bkpinfo->boot_loader == 'B') {
-        strcpy(bootldr_str, "BOOT0");
+        mr_asprintf(&bootldr_str, "BOOT0");
     }
 #endif
     else {
-        strcpy(bootldr_str, "unknown");
+        mr_asprintf(&bootldr_str, "unknown");
     }
     mr_asprintf(&tmp, "Your boot loader is %s and it boots from %s",
@@ -768 +767 @@
     }
     mr_fprintf(fd, "mindi_kernel=%s\n", bkpinfo->kernel_path);
+    mr_fprintf(fd, "mindi_additional_mods=%s\n", mr_conf->additional_modules);
 
     mr_fprintf(fd1, "files-in-filelist=%ld\n", lines_in_filelist);
@@ -777 +777 @@
     mr_fprintf(fd1, "bootloader.name=%s\n", bootldr_str);
     mr_fprintf(fd1, "bootloader.device=%s\n", bkpinfo->boot_device);
+
+    mr_free(bootldr_str);
 
     switch (bkpinfo->backup_media_type) {
@@ -961 +963 @@
         mr_free(tmp);
     }
-    mr_free(bootldr_str);
     mr_free(last_filelist_number);
     mr_free(devs_to_exclude);

branches/stable/mondo/src/common/libmondo-tools.c

@@ -743 +743 @@
     bkpinfo->kernel_path = tmp;
 
-    bkpinfo->boot_loader = '\0';
+    if (strcmp(mr_conf->boot_loader,"LILO") == 0) {
+        bkpinfo->boot_loader = 'L';
+    } else if (strcmp(mr_conf->boot_loader,"GRUB") == 0) {
+        bkpinfo->boot_loader = 'G';
+    } else if (strcmp(mr_conf->boot_loader,"ELILO") == 0) {
+        bkpinfo->boot_loader = 'E';
+    } else if (strcmp(mr_conf->boot_loader,"RAW") == 0) {
+        bkpinfo->boot_loader = 'R';
+    } else if (strcmp(mr_conf->boot_loader,"DD") == 0) {
+        bkpinfo->boot_loader = 'D';
+    } else if (strcmp(mr_conf->boot_loader,"BOOT0") == 0) {
+        bkpinfo->boot_loader = 'B';
+    } else if (strcmp(mr_conf->boot_loader,"NATIVE") == 0) {
+        bkpinfo->boot_loader = '\0';
+    } else{
+        mr_msg("Boot Loader %s unknown\n",mr_conf->boot_loader);
+        fatal_error("Unknown Boot Loader in conf file");
+    }
     bkpinfo->boot_device[0] = '\0';
     bkpinfo->zip_exe[0] = '\0';