Changeset 3885 in MondoRescue for branches/3.3/mondo/src/common/libmondo-archive.c

Timestamp:

Mar 10, 2024, 7:23:12 PM (3 months ago)

Author:

Bruno Cornec

Message:

Removes support for ia64 depracated in upstream kernel, and elilo

File:

• branches/3.3/mondo/src/common/libmondo-archive.c (modified) (5 diffs)

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

@@ -854 +854 @@
         if (bkpinfo->make_cd_use_lilo) {
             log_msg(1, "make_cd_use_lilo = TRUE");
-#ifdef __IA64__
-            log_msg(1, "IA64 --> elilo");
-            mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO);
-            res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
-            mr_free(full_isofs_cmd);
-#else
-            log_msg(1, "Non-ia64 --> lilo");
             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);
-#endif
         } else {
             log_msg(1, "make_cd_use_lilo = FALSE");
@@ -2589 +2581 @@
     char *cd_recovery_sz = NULL;
     char *tape_size_sz = NULL;
-    char *use_lilo_sz = NULL;   /* TODO: shared between LILO/ELILO */
+    char *use_lilo_sz = NULL;
     char *value = NULL;
     char *bootdev = NULL;
@@ -2701 +2693 @@
 #else
         /* Linux */
-#ifdef __IA64__
-        bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'");
-#else
         bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'");
-#endif
         if (strstr(bootdev, "/dev/cciss/")) {
             mr_free(bootdev);
-#ifdef __IA64__
-            bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1");
-#else
             bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1");
-#endif
         }
         if (!bootdev[0]) {
@@ -2745 +2729 @@
            bkpinfo->boot_loader != 'B' && bkpinfo->boot_loader != 'D' &&
 #endif
-#ifdef __IA64__
-           bkpinfo->boot_loader != 'E' &&
-#endif
            bkpinfo->boot_loader != 'L' && bkpinfo->boot_loader != 'G' && bkpinfo->boot_loader != 'R') {
         fatal_error("Please specify your boot loader and device, e.g. -l GRUB -f /dev/hda. Type 'man mondoarchive' to read the manual.");
@@ -2775 +2756 @@
             mr_free(bootldr_ver);
             bootldr_ver = call_program_and_get_last_line_of_output("grub2-install --version");
-        }
-    } else if (bkpinfo->boot_loader == 'E') {
-        mr_asprintf(bootldr_str, "ELILO");
-        /* TODO: fix it for Debian, Mageia, ... */
-        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/redhat/elilo.conf")) {
-            run_program_and_log_output("ln -sf /boot/efi/efi/redhat/elilo.conf /etc/elilo.conf", 5);
-        }
-        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/SuSE/elilo.conf")) {
-            run_program_and_log_output("ln -sf /boot/efi/efi/SuSE/elilo.conf /etc/elilo.conf", 5);
-        }
-        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/debian/elilo.conf")) {
-            run_program_and_log_output ("ln -sf /boot/efi/efi/debian/elilo.conf /etc/elilo.conf", 5);
-        }
-        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/debian/elilo.conf")) {
-            run_program_and_log_output ("ln -sf /boot/efi/debian/elilo.conf /etc/elilo.conf", 5);
-        }
-        if (!does_file_exist("/etc/elilo.conf")) {
-            mr_free(bootldr_str);
-            fatal_error("The de facto mondo standard location for your boot loader's config file is /etc/elilo.conf but I cannot find it there. What is wrong with your Linux distribution? Try finding it under /boot/efi and do 'ln -s /boot/efi/..../elilo.conf /etc/elilo.conf'");
         }
     } else if (bkpinfo->boot_loader == 'R') {