Changeset 3885 in MondoRescue for branches/3.3


Ignore:
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

Location:
branches/3.3
Files:
2 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • branches/3.3/mondo-doc/mondoarchive.8

    r3884 r3885  
    342342
    343343.TP
    344 .BI "\-l " "GRUB|LILO|ELILO|RAW"
     344.BI "\-l " "GRUB|LILO|RAW"
    345345Specify the boot loader. By default, your environment is examined and
    346346the boot loader can usually be discovered. If you specify RAW then the MBR will
    347347be backed up and restored byte-for-byte without any analysis. It is likely that
    348 you will also need to specify the boot device with \-f <dev>. ELILO is mandatory
    349 for IA64 machines. GRUB is mandatory for now for UEFI systems.
     348you will also need to specify the boot device with \-f <dev>.
     349GRUB is mandatory for now for UEFI systems.
    350350
    351351.TP
    … …  
    381381
    382382.SH ENVIRONMENT VARIABLES
    383 .IR ARCH
    384 This variable is passed to the environment by mondoarchive so that
    385 other tools are aware of the underlying hardware architecture.
    386 
    387383.IR MONDO_SHARE
    388384This variable is passed to the environment by mondoarchive so that

  • branches/3.3/mondo-doc/mondorescue-howto.sgml

    r3653 r3885  
    848848<itemizedlist>
    849849<listitem>
    850         <para>Intel(R)-compatible CPU (ia32, x86_64/amd64 or ia64)</para>
     850        <para>Intel(R)-compatible CPU (ia32, x86_64/amd64)</para>
    851851</listitem>
    852852<listitem>

  • branches/3.3/mondo/configure.ac

    r3879 r3885  
    107107        CPPFLAGS="$CPPFLAGS -D__IA32__ -D__X86_64__"
    108108        ;;
    109     ia64*)
    110         CPPFLAGS="$CPPFLAGS -D__IA64__"
    111         ;;
    112109    *)
    113         echo "*** Sorry, only Intel Architectures (ia32, x86_64, ia64) are supported at this time. Want to help?"
     110        echo "*** Sorry, only Intel based Architectures (ia32, x86_64) are supported at this time. Want to help?"
    114111        ;;
    115112esac

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

  • branches/3.3/mondo/src/include/my-stuff.h

    r3883 r3885  
    6060#endif                          /* DEBUG */
    6161
    62 #define IA64_BOOT_SIZE "16384"  /* Should be coherent with mindi */
    6362#define STD_PREFIX "mondorescue"    /* Should be coherent with mindi */
    6463
    … …  
    120119#define MAX_STR_LEN 512         ///< The maximum length of almost all @p char buffers in Mondo.
    121120                                        ///  Note: Make this divisible by eight to avoid aligment issues
    122                                         ///        on 64bit platforms like ia64.
     121                                        ///        on 64bit platforms
    123122#define MAXIMUM_RAID_DEVS 32    ///< The maximum number of RAID devices in the raidlist.
    124123#define MAXIMUM_ADDITIONAL_RAID_VARS 32 ///< The maximum number of additional RAID variables per RAID device in the raidlist.
    … …  
    195194
    196195/**
    197  * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image.
    198  */
    199 #define MONDO_MKISOFS_REGULAR_ELILO      MONDO_MKISOFS"-no-emul-boot -b images/mindi-bootroot.img -c images/boot.cat "
    200 
    201 /**
    202196 * The stub name of the temporary ISO image to create, burn, and remove.
    203197 */
    … …  
    208202 */
    209203#define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_SYSLINUX
    210 
    211 /**
    212  * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
    213      */
    214 #define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_ELILO
    215204
    216205/**

  • branches/3.3/mondo/src/mondoarchive/mondoarchive.c

    r3882 r3885  
    203203    mr_free(tmp1);
    204204
    205     /* Add the ARCH environment variable for ia64 purposes */
    206     mr_asprintf(tmp1,"%s",get_architecture());
    207     setenv("ARCH", tmp1, 1);
    208     mr_free(tmp1);
    209 
    210205    /* Add MONDO_SHARE environment variable for mindi */
    211206    setenv_mondo_share();

  • branches/3.3/mondo/src/mondorestore/mondo-prep.c

    r3879 r3885  
    741741    mr_asprintf(program, "newfs_msdos -F 32");
    742742#else
    743 #ifdef __IA64__
    744     /* For EFI partitions on ia64 take fat16
    745      * as we want to make small ones */
    746     mr_asprintf(program, "mkfs.vfat -F 16");
    747 #else
    748743    /* mkfs.vfat will make the best possible choice itself */
    749744    /* should avoid problems with mr-label later on when used */
    750745    mr_asprintf(program, "mkfs.vfat");
    751 #endif
    752746#endif
    753747#ifndef __FreeBSD__
    … …  
    20282022#endif
    20292023
    2030 #ifndef __IA64__
    20312024    part_table_fmt = which_partition_format(drivename);
    20322025
    … …  
    20412034    }
    20422035    mr_free(part_table_fmt);
    2043 #endif
    20442036
    20452037    retval += partition_device(pout_to_fdisk, drivename, current_devno, previous_devno, format, partsize);

  • branches/3.3/mondo/src/mondorestore/mondo-rstr-tools-EXT.h

    r2682 r3885  
    1616extern int run_grub(bool, char *);
    1717extern int run_lilo(bool);
    18 extern int run_elilo(bool);
    1918extern int run_raw_mbr(bool offer_to_hack_scripts, char *bd);
    2019extern char *find_my_editor(void);

  • branches/3.3/mondo/src/mondorestore/mondo-rstr-tools.c

    r3882 r3885  
    19211921
    19221922/**
    1923  * Install ELILO on the user's boot drive (determined by elilo.conf).
    1924  * @param offer_to_run_stabelilo If TRUE, then offer to hack the user's fstab for them.
    1925  * @return 0 for success, nonzero for failure.
    1926  */
    1927 int run_elilo(bool offer_to_run_stabelilo)
    1928 {
    1929   /** malloc **/
    1930     char *command = NULL;
    1931     char *tmp = NULL;
    1932     char *editor = NULL;
    1933 
    1934     int res;
    1935     int done;
    1936 
    1937     if (offer_to_run_stabelilo
    1938         && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
    1939 
    1940         /* interactive mode */
    1941     {
    1942         mvaddstr_and_log_it(g_currentY,
    1943                             0,
    1944                             "Modifying fstab and elilo.conf...                             ");
    1945         mr_asprintf(command, "mr-stabelilo-me");
    1946         res = run_program_and_log_output(command, 3);
    1947         mr_free(command);
    1948 
    1949         if (res) {
    1950             popup_and_OK("You will now edit fstab and elilo.conf, to make sure they match your new mountlist.");
    1951             for (done = FALSE; !done;) {
    1952                 editor = find_my_editor();
    1953                 if (editor == NULL) {
    1954                     popup_and_OK("No editor found. You won't be able to edit conf files");
    1955                     done = TRUE;
    1956                 } else {
    1957 
    1958                     if (!g_text_mode) {
    1959                         newtSuspend();
    1960                     }
    1961                     mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
    1962                     paranoid_system(tmp);
    1963                     mr_free(tmp);
    1964    
    1965                     mr_asprintf(tmp, "chroot %s %s /etc/elilo.conf", MNT_RESTORING, editor);
    1966                     paranoid_system(tmp);
    1967                     mr_free(tmp);
    1968                     mr_free(editor);
    1969 
    1970                     if (!g_text_mode) {
    1971                         newtResume();
    1972                     }
    1973 //              newtCls();
    1974                     if (ask_me_yes_or_no("Edit them again?")) {
    1975                         continue;
    1976                     }
    1977                     done = TRUE;
    1978                 }
    1979                 mr_free(editor);
    1980             }
    1981         } else {
    1982             log_to_screen("elilo.conf and fstab were modified OK");
    1983         }
    1984     } else
    1985         /* nuke mode */
    1986     {
    1987         res = TRUE;
    1988     }
    1989     return (res);
    1990 }
    1991 
    1992 /**************************************************************************
    1993  *END_RUN_ELILO                                                            *
    1994  **************************************************************************/
    1995 
    1996 
    1997 
    1998 /**
    19991923 * Install the user's boot loader in the MBR.
    2000  * Currently LILO, ELILO, GRUB, RAW (dd of MBR), and the FreeBSD bootloader are supported.
     1924 * Currently LILO, GRUB, RAW (dd of MBR), and the FreeBSD bootloader are supported.
    20011925 * @param offer_to_hack_scripts If TRUE, then offer to hack the user's fstab for them.
    20021926 * @return 0 for success, nonzero for failure.
    … …  
    20311955    backup_crucial_file(MNT_RESTORING, "/boot/grub2/grub.cfg");
    20321956    backup_crucial_file(MNT_RESTORING, "/etc/lilo.conf");
    2033     backup_crucial_file(MNT_RESTORING, "/etc/elilo.conf");
    20341957    backup_crucial_file(MNT_RESTORING, "/boot/grub/device.map");
    20351958    backup_crucial_file(MNT_RESTORING, "/boot/grub2/device.map");
    … …  
    20581981    if (!strcmp(name, "LILO")) {
    20591982        res = run_lilo(offer_to_hack_scripts);
    2060     } else if (!strcmp(name, "ELILO")) {
    2061         res = run_elilo(offer_to_hack_scripts);
    20621983    } else if (!strcmp(name, "GRUB")) {
    20631984        res = run_grub(offer_to_hack_scripts, device);

  • branches/3.3/mondo/src/mondorestore/mondorestore.c

    r3882 r3885  
    29112911
    29122912            if (!bkpinfo->please_dont_eject) {
    2913                 (void)eject_device(bkpinfo->backup_media_type);
     2913                eject_device(bkpinfo->media_device);
    29142914            }
    29152915            mvaddstr_and_log_it(g_currentY++, 0, "Run complete. Please remove media and reboot.");

  • branches/3.3/mondo/src/restore-scripts/mondo/Makefile.am

    r3704 r3885  
    11restoremondodir = $(pkgdatadir)/restore-scripts/mondo
    2 restoremondo_SCRIPTS = mr-grub mr-hack-fstab mr-hack-lilo mr-hack-elilo \
     2restoremondo_SCRIPTS = mr-grub mr-hack-fstab mr-hack-lilo \
    33                        mr-label-partitions-as-necessary \
    44                        mr-make-me-bootable mr-mount-me mr-mount-subroutine-me mr-raw \
    5                         mr-stabgrub-me mr-stablilo-me mr-stabelilo-me \
     5                        mr-stabgrub-me mr-stablilo-me \
    66                        mr-stabraw-me mr-unmount-me

  • branches/3.3/website/index.shtml

    r3545 r3885  
    1414  </div>
    1515  <div class="c"> <img src="/images/screenshots.png" alt="Mondo Rescue screenshots" title="Mondo Rescue Screenshots" /></div>
    16   <p class="c">Mondo Rescue is a GPL disaster recovery solution. It supports Linux (i386, x86_64, ia64) and FreeBSD (i386). It's packaged for multiple distributions (Fedora, RHEL, openSuSE, SLES, Mandriva, Mageia, Debian, Ubuntu, Gentoo). </p>
     16  <p class="c">Mondo Rescue is a GPL disaster recovery solution. It supports Linux (i386, x86_64) and FreeBSD (i386). It's packaged for multiple distributions (Fedora, RHEL, openSuSE, SLES, Mandriva, Mageia, Debian, Ubuntu, Gentoo). </p>
    1717  <p class="c">It supports tapes, disks, network and CD/DVD as backup media, multiple filesystems, LVM, software and hardware Raid, BIOS and UEFI.</p>
    1818  <p class="c">You need it to be safe.</p>
Note: See TracChangeset for help on using the changeset viewer.