Changeset 1671 in MondoRescue for branches/stable/mondo/src/common/libmondo-archive.c

Timestamp:

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

Author:

Bruno Cornec

Message:

handle 2 new conf file parameters

File:

• branches/stable/mondo/src/common/libmondo-archive.c (modified) (8 diffs)

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