Changeset 3888 in MondoRescue for branches/3.3/mondo

Timestamp:

Mar 10, 2024, 8:16:15 PM (4 months ago)

Author:

Bruno Cornec

Message:

Remove lilo bootable iso images feature obsolete - Change mondo/mindi interface as a consequence + nonbootable

Location:

branches/3.3/mondo/src/common

Files:

• libmondo-archive.c (modified) (8 diffs)
• libmondo-cli.c (modified) (1 diff)
• libmondo-devices.c (modified) (1 diff)
• libmondo-tools.c (modified) (4 diffs)
• mondostructures.h (modified) (1 diff)

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

@@ -683 +683 @@
  * - @c call_burn_iso
  * - @c call_make_iso
- * - @c make_cd_use_lilo
  * - @c manual_cd_tray
  * - @c scratchdir
@@ -845 +844 @@
         mr_free(tmp);
         log_msg(1, "Making bootable backup");
-
-#ifdef __FreeBSD__
-        bkpinfo->make_cd_use_lilo = TRUE;
-#endif
-
-
-        log_msg(1, "make_cd_use_lilo is actually %d", bkpinfo->make_cd_use_lilo);
-        if (bkpinfo->make_cd_use_lilo) {
-            log_msg(1, "make_cd_use_lilo = TRUE");
-            mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.img -c images/boot.cat -o '_ISO_' .",isofs_cmd,MONDO_MKISOFS);
-            // FIXME: fixed boot size probably wrong. lilo to be removed
-            res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
-            mr_free(full_isofs_cmd);
+        log_msg(1, "Isolinux");
+        if (bkpinfo->boot_type == UEFI) {
+            if (strstr(isofs_cmd,"xorriso")) {
+                /*  xorriso needs another '-' before efi-boot */
+                mr_asprintf(uefistr, "%s -%s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
+            } else {
+                mr_asprintf(uefistr, "%s %s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
+            }
         } else {
-            log_msg(1, "make_cd_use_lilo = FALSE");
-            log_msg(1, "Isolinux");
-            if (bkpinfo->boot_type == UEFI) {
-                if (strstr(isofs_cmd,"xorriso")) {
-                    /*  xorriso needs another '-' before efi-boot */
-                    mr_asprintf(uefistr, "%s -%s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
-                } else {
-                    mr_asprintf(uefistr, "%s %s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
-                }
-            } else {
-                mr_asprintf(uefistr, "%s",MONDO_MKISOFS_CMS);
-            }
-            mr_asprintf(full_isofs_cmd, "%s%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);
-            mr_free(uefistr);
-
-            res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
-            mr_free(full_isofs_cmd);
-        }
+            mr_asprintf(uefistr, "%s",MONDO_MKISOFS_CMS);
+        }
+        mr_asprintf(full_isofs_cmd, "%s%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);
+        mr_free(uefistr);
+
+        res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
+        mr_free(full_isofs_cmd);
         mr_free(isofs_cmd);
         paranoid_free(message_to_screen);
@@ -2548 +2531 @@
  * - @c image_devs
  * - @c kernel_path
- * - @c make_cd_use_lilo
  * - @c media_device
  * - @c media_size
@@ -2581 +2563 @@
     char *cd_recovery_sz = NULL;
     char *tape_size_sz = NULL;
-    char *use_lilo_sz = NULL;
     char *value = NULL;
     char *bootdev = NULL;
@@ -2666 +2647 @@
     } else {
         mr_asprintf(cd_recovery_sz, "no");
-    }
-    if (bkpinfo->make_cd_use_lilo) {
-        mr_asprintf(use_lilo_sz, "yes");
-    } else {
-        mr_asprintf(use_lilo_sz, "no");
     }
     if (bkpinfo->boot_type == UEFI) {
@@ -2879 +2855 @@
 
     unlink(MINDI_RUNFILE);
-    mr_asprintf(command, "mindi %s --custom %s %s/images '%s' '%s' '%s' '%ld' '%s' '%s' '%s' '%s' '%s' '%ld' '%s' '%s' '%s' '%s' '%ld' '%d' '%s' '%s' '%s' '%s' 2>&1 >> %s",
-            //          1           2   3          4   5    6     7     8    9   10   11   12   13    14   15   16   17   18    19   20   21  22    23         24
+    mr_asprintf(command, "mindi %s --custom %s %s/images '%s' '%s' '%s' '%ld' '%s' '%s' '%s' '%s' '%s' '%ld' '%s' '%s' '%s' '%s' '%ld' '%s' %s' '%s' 2>&1 >> %s",
+                                            //          1       2   3     4   5    6     7     8    9   10   11   12   13    14   15   17   18    19   20   21  22 
             tmp2,           // parameter #1
             bkpinfo->tmpdir,    // parameter #2
@@ -2899 +2875 @@
                         // parameter #14
             use_comp_sz,        // parameter #15
-            use_lilo_sz,        // parameter #16
-            use_star_sz,        // parameter #17
+            use_star_sz,        // parameter #16
             bkpinfo->internal_tape_block_size,  
-                        // parameter #18 (LONG)
-            bkpinfo->differential,  // parameter #19 (INT)
-            use_gzip_sz,        // parameter #20 (STRING)
-            use_lzma_sz,        // parameter #21 (STRING)
-            "no",           // parameter #22 (STRING) bootable image ?
-            boot_type,      // parameter #23 (STRING)
-            MINDI_RUNFILE       // redirect to log file (#24)
+                        // parameter #17 (LONG)
+            bkpinfo->differential,  // parameter #18 (INT)
+            use_gzip_sz,        // parameter #19 (STRING)
+            use_lzma_sz,        // parameter #20 (STRING)
+            boot_type,      // parameter #21 (STRING)
+            MINDI_RUNFILE       // redirect to log file (#22)
             );
 
@@ -2920 +2894 @@
     mr_free(last_filelist_number);
     mr_free(use_comp_sz);
-    mr_free(use_lilo_sz);
     mr_free(use_star_sz);
     mr_free(use_gzip_sz);

branches/3.3/mondo/src/common/libmondo-cli.c

@@ -832 +832 @@
 #ifndef __FreeBSD__
     if ((!is_this_a_valid_disk_format("vfat")) && (! bkpinfo->restore_data)) {
-        bkpinfo->make_cd_use_lilo = TRUE;
-        log_to_screen("Your kernel appears not to support vfat filesystems. I am therefore");
-        log_to_screen("using LILO instead of SYSLINUX as the media boot loader.");
+        log_to_screen("Your kernel appears not to support vfat filesystems.");
+        fatal_error("Aborting");
     }
     if ((run_program_and_log_output("which mkfs.vfat", 2)) && (! bkpinfo->restore_data)) {
-        bkpinfo->make_cd_use_lilo = TRUE;
         log_to_screen("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
-        log_to_screen("your boot loader. I shall therefore use LILO instead.");
+        log_to_screen("your boot loader.");
+        fatal_error("Aborting");
     }
 #endif

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

@@ -2553 +2553 @@
         }
 // Interactive mode:
-        bkpinfo->make_cd_use_lilo = FALSE;
         bkpinfo->backup_data = TRUE;
         if (strcmp(compression_type,"lzo") == 0) {

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

@@ -346 +346 @@
  * - Used: @c bkpinfo->isodir
  * - Used: @c bkpinfo->manual_cd_tray
- * - Used: @c bkpinfo->make_cd_use_lilo
  * - Used: @c bkpinfo->media_device
  * - Used: @c bkpinfo->netfs_mount
@@ -431 +430 @@
     if (bkpinfo->backup_media_type == optical) {
         if ((cdr_exe = find_home_of_exe("growisofs")) == NULL) {
+            mr_free(cdr_exe);
             fatal_error("Please install growisofs.");
         }
-        if
 #ifdef __FreeBSD__
-            (TRUE)
+        mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
 #else
-            (bkpinfo->make_cd_use_lilo)
+        mondo_mkisofs_sz = mr_compute_uefi_string(cdr_exe);
 #endif
-    {
-        mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
-    }
-        else {
-            mondo_mkisofs_sz = mr_compute_uefi_string(cdr_exe);
-        }
         mr_free(cdr_exe);
 
@@ -494 +487 @@
         mr_free(tmp);
 
-        if
 #ifdef __FreeBSD__
-            (TRUE)
+        mr_asprintf(mondo_mkisofs_sz, "%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_LILO);
 #else
-            (bkpinfo->make_cd_use_lilo)
+        mondo_mkisofs_sz = mr_compute_uefi_string(isofs_cmd);
 #endif
-    {
-        mr_asprintf(mondo_mkisofs_sz, "%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_LILO);
-    }
-        else {
-                mondo_mkisofs_sz = mr_compute_uefi_string(isofs_cmd);
-        }
         mr_free(isofs_cmd);
 
@@ -970 +956 @@
     bkpinfo->please_dont_eject = FALSE;
     bkpinfo->manual_cd_tray = FALSE;
-    bkpinfo->make_cd_use_lilo = FALSE;
     bkpinfo->use_obdr = FALSE;
     bkpinfo->restore_mode = interactive;

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

@@ -617 +617 @@
    */
     bool manual_cd_tray;
-
-  /**
-   * If TRUE, make the bootable CD use LILO. If FALSE, use isolinux (the default).
-   */
-    bool make_cd_use_lilo;
 
   /**