Changeset 1669 in MondoRescue

Timestamp:

Sep 30, 2007, 8:16:06 PM (17 years ago)

Author:

Bruno Cornec

Message:

use conf file for kernel_path

Location:

branches/stable/mondo

Files:

• distributions/conf/mondo.conf.dist (modified) (1 diff)
• src/common/libmondo-archive.c (modified) (3 diffs)
• src/common/libmondo-devices.c (modified) (1 diff)
• src/common/libmondo-files.c (modified) (2 diffs)
• src/common/libmondo-tools.c (modified) (2 diffs)
• src/common/mondostructures.h (modified) (1 diff)
• src/mondoarchive/mondo-cli.c (modified) (1 diff)

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

@@ -91 +91 @@
 #mondorescue_kernel="/boot/vmlinuz.special"
 
+# DONE
 #
 # Additional modules to support 

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

@@ -474 +474 @@
     copy_mondo_and_mindi_stuff_to_scratchdir(); // payload, too, if it exists
 #if __FreeBSD__ == 5
-    strcpy(bkpinfo->kernel_path, "/boot/kernel/kernel");
+    mr_allocstr(bkpinfo->kernel_path, "/boot/kernel/kernel");
 #elif __FreeBSD__ == 4
-    strcpy(bkpinfo->kernel_path, "/kernel");
+    mr_allocstr(bkpinfo->kernel_path, "/kernel");
 #elif linux
     if (figure_out_kernel_path_interactively_if_necessary
@@ -763 +763 @@
     fd1 = mr_fopen(MONDORESTORECFG, "a");
 
+    mr_fprintf(fd, "mindi_use_own_kernel=yes\n");
+    if (strcmp(mr_conf->mondo_kernel,"FAILSAFE") == 0) {
+    } else {
+    }
     mr_fprintf(fd, "mindi_kernel=%s\n", bkpinfo->kernel_path);
-    mr_fprintf(fd, "mindi_use_own_kernel=yes\n");
 
     mr_fprintf(fd1, "files-in-filelist=%ld\n", lines_in_filelist);
@@ -868 +871 @@
     } else {
         mr_fprintf(fd1, "differential=no\n");
+    }
+    if (mr_conf->mondo_create_mindi_cd) {
+        mr_fprintf(fd1, "mindi_write_cd=yes\n");
+    } else {
+        mr_fprintf(fd1, "mindi_write_cd=no\n");
     }
 

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

@@ -1988 +1988 @@
 #endif
         {
-            strcpy(bkpinfo->kernel_path, "FAILSAFE");
+            mr_allocstr(bkpinfo->kernel_path, "FAILSAFE");
         }
 

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

@@ -250 +250 @@
     char *command = NULL;
 
-    malloc_string(tmp);
-    if (!kernel[0]) {
-        strcpy(kernel,
+    if (kernel == NULL) {
+        mr_allocstr(kernel,
                call_program_and_get_last_line_of_output
                ("mindi --findkernel 2> /dev/null"));
     }
     // If we didn't get anything back, check whether mindi raised a fatal error
-    if (!kernel[0]) {
+    if (kernel == NULL) {
         mr_asprintf(&command, "grep 'Fatal error' /var/log/mindi.log");
-        strcpy(tmp, call_program_and_get_last_line_of_output(command));
+        mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
         if (strlen(tmp) > 1) {
             popup_and_OK(tmp);
@@ -265 +264 @@
         }
         mr_free(command);
+        mr_free(tmp);
     }
     log_it("Calling Mindi with kernel path of '%s'", kernel);
-    while (!kernel[0]) {
+    while (kernel == NULL) {
         if (!ask_me_yes_or_no
             ("Kernel not found or invalid. Choose another?")) {

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

@@ -740 +740 @@
 
     bkpinfo->media_size = mr_conf->iso_burning_speed;
+    mr_asprintf(&tmp,mr_conf->kernel);
+    bkpinfo->kernel_path = tmp;
+
     bkpinfo->boot_loader = '\0';
     bkpinfo->boot_device[0] = '\0';
@@ -773 +776 @@
     bkpinfo->image_devs[0] = '\0';
     bkpinfo->postnuke_tarball[0] = '\0';
-    bkpinfo->kernel_path[0] = '\0';
     bkpinfo->nfs_mount[0] = '\0';
     bkpinfo->nfs_remote_dir[0] = '\0';

branches/stable/mondo/src/common/mondostructures.h

@@ -525 +525 @@
    * included with Mindi.
    */
-    char kernel_path[MAX_STR_LEN];
+    char *kernel_path;
 
   /**

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -593 +593 @@
     }
     if (flag_set['k']) {
-        strncpy(bkpinfo->kernel_path, flag_val['k'], MAX_STR_LEN);
+        mr_allocstr(bkpinfo->kernel_path, flag_val['k']);
         if (!strcmp(bkpinfo->kernel_path, "failsafe")) {
-            strcpy(bkpinfo->kernel_path, "FAILSAFE");
+            mr_allocstr(bkpinfo->kernel_path, "FAILSAFE");
         }
         if (strcmp(bkpinfo->kernel_path, "FAILSAFE")