Changeset 3885 in MondoRescue for branches/3.3/mondo/src/common


Ignore:
Timestamp:
Mar 10, 2024, 7:23:12 PM (4 months ago)
Author:
Bruno Cornec
Message:

Removes support for ia64 depracated in upstream kernel, and elilo

Location:
branches/3.3/mondo/src/common
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r3883 r3885  
    854854        if (bkpinfo->make_cd_use_lilo) {
    855855            log_msg(1, "make_cd_use_lilo = TRUE");
    856 #ifdef __IA64__
    857             log_msg(1, "IA64 --> elilo");
    858             mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO);
    859             res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
    860             mr_free(full_isofs_cmd);
    861 #else
    862             log_msg(1, "Non-ia64 --> lilo");
    863856            mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.img -c images/boot.cat -o '_ISO_' .",isofs_cmd,MONDO_MKISOFS);
    864857            // FIXME: fixed boot size probably wrong. lilo to be removed
    865858            res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
    866859            mr_free(full_isofs_cmd);
    867 #endif
    868860        } else {
    869861            log_msg(1, "make_cd_use_lilo = FALSE");
    … …  
    25892581    char *cd_recovery_sz = NULL;
    25902582    char *tape_size_sz = NULL;
    2591     char *use_lilo_sz = NULL;   /* TODO: shared between LILO/ELILO */
     2583    char *use_lilo_sz = NULL;
    25922584    char *value = NULL;
    25932585    char *bootdev = NULL;
    … …  
    27012693#else
    27022694        /* Linux */
    2703 #ifdef __IA64__
    2704         bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'");
    2705 #else
    27062695        bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'");
    2707 #endif
    27082696        if (strstr(bootdev, "/dev/cciss/")) {
    27092697            mr_free(bootdev);
    2710 #ifdef __IA64__
    2711             bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1");
    2712 #else
    27132698            bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1");
    2714 #endif
    27152699        }
    27162700        if (!bootdev[0]) {
    … …  
    27452729           bkpinfo->boot_loader != 'B' && bkpinfo->boot_loader != 'D' &&
    27462730#endif
    2747 #ifdef __IA64__
    2748            bkpinfo->boot_loader != 'E' &&
    2749 #endif
    27502731           bkpinfo->boot_loader != 'L' && bkpinfo->boot_loader != 'G' && bkpinfo->boot_loader != 'R') {
    27512732        fatal_error("Please specify your boot loader and device, e.g. -l GRUB -f /dev/hda. Type 'man mondoarchive' to read the manual.");
    … …  
    27752756            mr_free(bootldr_ver);
    27762757            bootldr_ver = call_program_and_get_last_line_of_output("grub2-install --version");
    2777         }
    2778     } else if (bkpinfo->boot_loader == 'E') {
    2779         mr_asprintf(bootldr_str, "ELILO");
    2780         /* TODO: fix it for Debian, Mageia, ... */
    2781         if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/redhat/elilo.conf")) {
    2782             run_program_and_log_output("ln -sf /boot/efi/efi/redhat/elilo.conf /etc/elilo.conf", 5);
    2783         }
    2784         if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/SuSE/elilo.conf")) {
    2785             run_program_and_log_output("ln -sf /boot/efi/efi/SuSE/elilo.conf /etc/elilo.conf", 5);
    2786         }
    2787         if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/debian/elilo.conf")) {
    2788             run_program_and_log_output ("ln -sf /boot/efi/efi/debian/elilo.conf /etc/elilo.conf", 5);
    2789         }
    2790         if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/debian/elilo.conf")) {
    2791             run_program_and_log_output ("ln -sf /boot/efi/debian/elilo.conf /etc/elilo.conf", 5);
    2792         }
    2793         if (!does_file_exist("/etc/elilo.conf")) {
    2794             mr_free(bootldr_str);
    2795             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'");
    27962758        }
    27972759    } else if (bkpinfo->boot_loader == 'R') {

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

    r3883 r3885  
    767767#  define BOOT_LOADER_CHARS "GLBMR"
    768768#else
    769 #  ifdef __IA64__
    770 #    define BOOT_LOADER_CHARS "GER"
    771 #  else
    772 #    define BOOT_LOADER_CHARS "GLR"
    773 #  endif
     769#  define BOOT_LOADER_CHARS "GLR"
    774770#endif
    775771        if (!strchr(BOOT_LOADER_CHARS, (bkpinfo->boot_loader = flag_val['l'][0]))) {
    776             log_msg(1, "%c? What is %c? I need G, L, E or R.", bkpinfo->boot_loader, bkpinfo->boot_loader);
    777             fatal_error("Please specify GRUB, LILO, ELILO or RAW with the -l switch");
     772            log_msg(1, "%c? What is %c? I need G, L, or R.", bkpinfo->boot_loader, bkpinfo->boot_loader);
     773            fatal_error("Please specify GRUB, LILO or RAW with the -l switch");
    778774        }
    779775#undef BOOT_LOADER_CHARS
    … …  
    842838    if ((run_program_and_log_output("which mkfs.vfat", 2)) && (! bkpinfo->restore_data)) {
    843839        bkpinfo->make_cd_use_lilo = TRUE;
    844 #ifdef __IA32__
    845840        log_to_screen("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
    846841        log_to_screen("your boot loader. I shall therefore use LILO instead.");
    847 #endif
    848 #ifdef __IA64__
    849         log_to_screen("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
    850         log_to_screen("environment correctly. Please install it.");
    851         fatal_error("Aborting");
    852 #endif
    853     }
    854 #ifdef __IA64__
    855     /* We force ELILO usage on IA64 */
    856     bkpinfo->make_cd_use_lilo = TRUE;
    857 #endif
     842    }
    858843#endif
    859844

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

    r3883 r3885  
    17711771    DIR *fd = NULL;
    17721772
    1773 #ifdef __IA64__
    1774     return(EFI);
    1775 #endif
    17761773    /* Try to detect whether we are in fact in UEFI mode */
    17771774    fd = opendir("/sys/firmware/efi");
    … …  
    17881785 * Find out which boot loader is in use.
    17891786 * @param which_device Device to look for the boot loader on.
    1790  * @return 'L' for LILO, 'E'for ELILO, 'G' for GRUB, 'B' or 'D' for FreeBSD boot loaders, or 'U' for Unknown.
     1787 * @return 'L' for LILO, 'G' for GRUB, 'B' or 'D' for FreeBSD boot loaders, or 'U' for Unknown.
    17911788 * @note Under Linux, all drives are examined, not just @p which_device.
    17921789 */
    … …  
    18131810        count_dangerouslydedicated++;
    18141811    }
    1815     log_it("%d grubs and %d lilos and %d elilos and %d boot0s and %d DD\n",
    1816            count_grubs, count_lilos, count_elilos, count_boot0s,
     1812    log_it("%d grubs and %d lilos andand %d boot0s and %d DD\n",
     1813           count_grubs, count_lilos, count_boot0s,
    18171814           count_dangerouslydedicated);
    18181815
    … …  
    18511848
    18521849    /*@ end vars *************************************************** */
    1853 
    1854 #ifdef __IA64__
    1855     /* No choice for it */
    1856     return ('E');
    1857 #endif
    1858     if (bkpinfo->boot_type == EFI) {
    1859         /* No choice for it */
    1860         return ('E');
    1861     }
    18621850
    18631851    if (bkpinfo->boot_type == UEFI) {
    … …  
    24552443            mr_asprintf(bkpinfo->boot_device, "%s", tmp1);
    24562444
    2457             if (does_string_exist_in_boot_block(bkpinfo->boot_device, "ELILO")) {
    2458                 i = 'E';
    2459             } else
    2460                 if (does_string_exist_in_boot_block(bkpinfo->boot_device, "LILO")) {
     2445            if (does_string_exist_in_boot_block(bkpinfo->boot_device, "LILO")) {
    24612446                i = 'L';
    24622447            } else
    … …  
    25682553        }
    25692554// Interactive mode:
    2570 #ifdef __IA64__
    2571         bkpinfo->make_cd_use_lilo = TRUE;
    2572 #else
    25732555        bkpinfo->make_cd_use_lilo = FALSE;
    2574 #endif
    25752556        bkpinfo->backup_data = TRUE;
    25762557        if (strcmp(compression_type,"lzo") == 0) {

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

    r3883 r3885  
    191191#   endif
    192192#endif
    193 #ifdef __IA64__
    194     return ("ia64");
    195 #endif
    196193    return ("unknown");
    197194}
    … …  
    442439            (bkpinfo->make_cd_use_lilo)
    443440#endif
    444 #ifdef __IA64__
    445     {
    446         mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);
    447     }
    448 #else
    449441    {
    450442        mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
    451443    }
    452 #endif
    453444        else {
    454445            mondo_mkisofs_sz = mr_compute_uefi_string(cdr_exe);
    … …  
    509500            (bkpinfo->make_cd_use_lilo)
    510501#endif
    511 #ifdef __IA64__
    512     {
    513         mr_asprintf(mondo_mkisofs_sz, "%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_ELILO);
    514     }
    515 #else
    516502    {
    517503        mr_asprintf(mondo_mkisofs_sz, "%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_LILO);
    518504    }
    519 #endif
    520505        else {
    521506                mondo_mkisofs_sz = mr_compute_uefi_string(isofs_cmd);

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

    r3883 r3885  
    351351   * - 'G' for GRUB
    352352   * - 'L' for LILO
    353    * - 'E' for ELILO
    354353   * - (FreeBSD only) 'B' for boot0
    355354   * - (FreeBSD only) 'D' for dangerously dedicated
    … …  
    620619
    621620  /**
    622    * If TRUE, make the bootable CD use LILO/ELILO. If FALSE, use isolinux (the default).
     621   * If TRUE, make the bootable CD use LILO. If FALSE, use isolinux (the default).
    623622   */
    624623    bool make_cd_use_lilo;
Note: See TracChangeset for help on using the changeset viewer.