Changeset 3885 in MondoRescue for branches/3.3/mondo

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/mondo

Files:

• configure.ac (modified) (1 diff)
• src/common/libmondo-archive.c (modified) (5 diffs)
• src/common/libmondo-cli.c (modified) (2 diffs)
• src/common/libmondo-devices.c (modified) (6 diffs)
• src/common/libmondo-tools.c (modified) (3 diffs)
• src/common/mondostructures.h (modified) (2 diffs)
• src/include/my-stuff.h (modified) (4 diffs)
• src/mondoarchive/mondoarchive.c (modified) (1 diff)
• src/mondorestore/mondo-prep.c (modified) (3 diffs)
• src/mondorestore/mondo-rstr-tools-EXT.h (modified) (1 diff)
• src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)
• src/mondorestore/mondorestore.c (modified) (1 diff)
• src/restore-scripts/mondo/Makefile.am (modified) (1 diff)
• src/restore-scripts/mondo/mr-hack-elilo (deleted)
• src/restore-scripts/mondo/mr-stabelilo-me (deleted)

branches/3.3/mondo/configure.ac

@@ -107 +107 @@
         CPPFLAGS="$CPPFLAGS -D__IA32__ -D__X86_64__"
         ;;
-    ia64*)
-        CPPFLAGS="$CPPFLAGS -D__IA64__"
-        ;;
     *)
-        echo "*** Sorry, only Intel Architectures (ia32, x86_64, ia64) are supported at this time. Want to help?" 
+        echo "*** Sorry, only Intel based Architectures (ia32, x86_64) are supported at this time. Want to help?" 
         ;;
 esac

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') {

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

@@ -767 +767 @@
 #  define BOOT_LOADER_CHARS "GLBMR"
 #else
-#  ifdef __IA64__
-#    define BOOT_LOADER_CHARS "GER"
-#  else
-#    define BOOT_LOADER_CHARS "GLR"
-#  endif
+#  define BOOT_LOADER_CHARS "GLR"
 #endif
         if (!strchr(BOOT_LOADER_CHARS, (bkpinfo->boot_loader = flag_val['l'][0]))) {
-            log_msg(1, "%c? What is %c? I need G, L, E or R.", bkpinfo->boot_loader, bkpinfo->boot_loader);
-            fatal_error("Please specify GRUB, LILO, ELILO  or RAW with the -l switch");
+            log_msg(1, "%c? What is %c? I need G, L, or R.", bkpinfo->boot_loader, bkpinfo->boot_loader);
+            fatal_error("Please specify GRUB, LILO or RAW with the -l switch");
         }
 #undef BOOT_LOADER_CHARS
@@ -842 +838 @@
     if ((run_program_and_log_output("which mkfs.vfat", 2)) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
-#ifdef __IA32__
         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.");
-#endif
-#ifdef __IA64__
-        log_to_screen("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
-        log_to_screen("environment correctly. Please install it.");
-        fatal_error("Aborting");
-#endif
-    }
-#ifdef __IA64__
-    /* We force ELILO usage on IA64 */
-    bkpinfo->make_cd_use_lilo = TRUE;
-#endif
+    }
 #endif
 

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

@@ -1771 +1771 @@
     DIR *fd = NULL;
 
-#ifdef __IA64__
-    return(EFI);
-#endif
     /* Try to detect whether we are in fact in UEFI mode */
     fd = opendir("/sys/firmware/efi");
@@ -1788 +1785 @@
  * Find out which boot loader is in use.
  * @param which_device Device to look for the boot loader on.
- * @return 'L' for LILO, 'E'for ELILO, 'G' for GRUB, 'B' or 'D' for FreeBSD boot loaders, or 'U' for Unknown.
+ * @return 'L' for LILO, 'G' for GRUB, 'B' or 'D' for FreeBSD boot loaders, or 'U' for Unknown.
  * @note Under Linux, all drives are examined, not just @p which_device.
  */
@@ -1813 +1810 @@
         count_dangerouslydedicated++;
     }
-    log_it("%d grubs and %d lilos and %d elilos and %d boot0s and %d DD\n",
-           count_grubs, count_lilos, count_elilos, count_boot0s,
+    log_it("%d grubs and %d lilos andand %d boot0s and %d DD\n",
+           count_grubs, count_lilos, count_boot0s,
            count_dangerouslydedicated);
 
@@ -1851 +1848 @@
 
     /*@ end vars *************************************************** */
-
-#ifdef __IA64__
-    /* No choice for it */
-    return ('E');
-#endif
-    if (bkpinfo->boot_type == EFI) {
-        /* No choice for it */
-        return ('E');
-    }
 
     if (bkpinfo->boot_type == UEFI) {
@@ -2455 +2443 @@
             mr_asprintf(bkpinfo->boot_device, "%s", tmp1);
 
-            if (does_string_exist_in_boot_block(bkpinfo->boot_device, "ELILO")) {
-                i = 'E';
-            } else
-                if (does_string_exist_in_boot_block(bkpinfo->boot_device, "LILO")) {
+            if (does_string_exist_in_boot_block(bkpinfo->boot_device, "LILO")) {
                 i = 'L';
             } else
@@ -2568 +2553 @@
         }
 // Interactive mode:
-#ifdef __IA64__
-        bkpinfo->make_cd_use_lilo = TRUE;
-#else
         bkpinfo->make_cd_use_lilo = FALSE;
-#endif
         bkpinfo->backup_data = TRUE;
         if (strcmp(compression_type,"lzo") == 0) {

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

@@ -191 +191 @@
 #   endif
 #endif
-#ifdef __IA64__
-    return ("ia64");
-#endif
     return ("unknown");
 }
@@ -442 +439 @@
             (bkpinfo->make_cd_use_lilo)
 #endif
-#ifdef __IA64__
-    {
-        mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);
-    }
-#else
     {
         mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
     }
-#endif
         else {
             mondo_mkisofs_sz = mr_compute_uefi_string(cdr_exe);
@@ -509 +500 @@
             (bkpinfo->make_cd_use_lilo)
 #endif
-#ifdef __IA64__
-    {
-        mr_asprintf(mondo_mkisofs_sz, "%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_ELILO);
-    }
-#else
     {
         mr_asprintf(mondo_mkisofs_sz, "%s%s ", isofs_cmd, MONDO_MKISOFS_REGULAR_LILO);
     }
-#endif
         else {
                 mondo_mkisofs_sz = mr_compute_uefi_string(isofs_cmd);

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

@@ -351 +351 @@
    * - 'G' for GRUB
    * - 'L' for LILO
-   * - 'E' for ELILO
    * - (FreeBSD only) 'B' for boot0
    * - (FreeBSD only) 'D' for dangerously dedicated
@@ -620 +619 @@
 
   /**
-   * If TRUE, make the bootable CD use LILO/ELILO. If FALSE, use isolinux (the default).
+   * If TRUE, make the bootable CD use LILO. If FALSE, use isolinux (the default).
    */
     bool make_cd_use_lilo;

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

@@ -60 +60 @@
 #endif                          /* DEBUG */
 
-#define IA64_BOOT_SIZE "16384"  /* Should be coherent with mindi */
 #define STD_PREFIX "mondorescue"    /* Should be coherent with mindi */
 
@@ -120 +119 @@
 #define MAX_STR_LEN 512         ///< The maximum length of almost all @p char buffers in Mondo.
                                         ///  Note: Make this divisible by eight to avoid aligment issues
-                                        ///        on 64bit platforms like ia64.
+                                        ///        on 64bit platforms
 #define MAXIMUM_RAID_DEVS 32    ///< The maximum number of RAID devices in the raidlist.
 #define MAXIMUM_ADDITIONAL_RAID_VARS 32 ///< The maximum number of additional RAID variables per RAID device in the raidlist.
@@ -195 +194 @@
 
 /**
- * @c mkisofs command to generate a bootable CD using ELILO, except for -o option and the directory to image.
- */
-#define MONDO_MKISOFS_REGULAR_ELILO      MONDO_MKISOFS"-no-emul-boot -b images/mindi-bootroot.img -c images/boot.cat "
-
-/**
  * The stub name of the temporary ISO image to create, burn, and remove.
  */
@@ -208 +202 @@
  */
 #define MONDO_GROWISOFS_REGULAR_SYSLINUX "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_SYSLINUX
-
-/**
- * @c growisofs command to generate a bootable DVD using LILO, except for the directory to image.
-     */
-#define MONDO_GROWISOFS_REGULAR_ELILO     "growisofs -use-the-force-luke "MONDO_MKISOFS_REGULAR_ELILO
 
 /**

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

@@ -203 +203 @@
     mr_free(tmp1);
 
-    /* Add the ARCH environment variable for ia64 purposes */
-    mr_asprintf(tmp1,"%s",get_architecture());
-    setenv("ARCH", tmp1, 1);
-    mr_free(tmp1);
-
     /* Add MONDO_SHARE environment variable for mindi */
     setenv_mondo_share();

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

@@ -741 +741 @@
     mr_asprintf(program, "newfs_msdos -F 32");
 #else
-#ifdef __IA64__
-    /* For EFI partitions on ia64 take fat16 
-     * as we want to make small ones */
-    mr_asprintf(program, "mkfs.vfat -F 16");
-#else
     /* mkfs.vfat will make the best possible choice itself */
     /* should avoid problems with mr-label later on when used */
     mr_asprintf(program, "mkfs.vfat");
-#endif
 #endif
 #ifndef __FreeBSD__
@@ -2028 +2022 @@
 #endif
 
-#ifndef __IA64__
     part_table_fmt = which_partition_format(drivename);
 
@@ -2041 +2034 @@
     }
     mr_free(part_table_fmt);
-#endif
 
     retval += partition_device(pout_to_fdisk, drivename, current_devno, previous_devno, format, partsize);

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

@@ -16 +16 @@
 extern int run_grub(bool, char *);
 extern int run_lilo(bool);
-extern int run_elilo(bool);
 extern int run_raw_mbr(bool offer_to_hack_scripts, char *bd);
 extern char *find_my_editor(void);

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

@@ -1921 +1921 @@
 
 /**
- * Install ELILO on the user's boot drive (determined by elilo.conf).
- * @param offer_to_run_stabelilo If TRUE, then offer to hack the user's fstab for them.
- * @return 0 for success, nonzero for failure.
- */
-int run_elilo(bool offer_to_run_stabelilo)
-{
-  /** malloc **/
-    char *command = NULL;
-    char *tmp = NULL;
-    char *editor = NULL;
-
-    int res;
-    int done;
-
-    if (offer_to_run_stabelilo
-        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
-
-        /* interactive mode */
-    {
-        mvaddstr_and_log_it(g_currentY,
-                            0,
-                            "Modifying fstab and elilo.conf...                             ");
-        mr_asprintf(command, "mr-stabelilo-me");
-        res = run_program_and_log_output(command, 3);
-        mr_free(command);
-
-        if (res) {
-            popup_and_OK("You will now edit fstab and elilo.conf, to make sure they match your new mountlist.");
-            for (done = FALSE; !done;) {
-                editor = find_my_editor();
-                if (editor == NULL) {
-                    popup_and_OK("No editor found. You won't be able to edit conf files");
-                    done = TRUE;
-                } else {
-
-                    if (!g_text_mode) {
-                        newtSuspend();
-                    }
-                    mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
-                    paranoid_system(tmp);
-                    mr_free(tmp);
-    
-                    mr_asprintf(tmp, "chroot %s %s /etc/elilo.conf", MNT_RESTORING, editor);
-                    paranoid_system(tmp);
-                    mr_free(tmp);
-                    mr_free(editor);
-
-                    if (!g_text_mode) {
-                        newtResume();
-                    }
-//              newtCls();
-                    if (ask_me_yes_or_no("Edit them again?")) {
-                        continue;
-                    }
-                    done = TRUE;
-                }
-                mr_free(editor);
-            }
-        } else {
-            log_to_screen("elilo.conf and fstab were modified OK");
-        }
-    } else
-        /* nuke mode */
-    {
-        res = TRUE;
-    }
-    return (res);
-}
-
-/**************************************************************************
- *END_RUN_ELILO                                                            *
- **************************************************************************/
-
-
-
-/**
  * Install the user's boot loader in the MBR.
- * Currently LILO, ELILO, GRUB, RAW (dd of MBR), and the FreeBSD bootloader are supported.
+ * Currently LILO, GRUB, RAW (dd of MBR), and the FreeBSD bootloader are supported.
  * @param offer_to_hack_scripts If TRUE, then offer to hack the user's fstab for them.
  * @return 0 for success, nonzero for failure.
@@ -2031 +1955 @@
     backup_crucial_file(MNT_RESTORING, "/boot/grub2/grub.cfg");
     backup_crucial_file(MNT_RESTORING, "/etc/lilo.conf");
-    backup_crucial_file(MNT_RESTORING, "/etc/elilo.conf");
     backup_crucial_file(MNT_RESTORING, "/boot/grub/device.map");
     backup_crucial_file(MNT_RESTORING, "/boot/grub2/device.map");
@@ -2058 +1981 @@
     if (!strcmp(name, "LILO")) {
         res = run_lilo(offer_to_hack_scripts);
-    } else if (!strcmp(name, "ELILO")) {
-        res = run_elilo(offer_to_hack_scripts);
     } else if (!strcmp(name, "GRUB")) {
         res = run_grub(offer_to_hack_scripts, device);

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

@@ -2911 +2911 @@
 
             if (!bkpinfo->please_dont_eject) {
-                (void)eject_device(bkpinfo->backup_media_type);
+                eject_device(bkpinfo->media_device);
             }
             mvaddstr_and_log_it(g_currentY++, 0, "Run complete. Please remove media and reboot.");

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

@@ -1 +1 @@
 restoremondodir = $(pkgdatadir)/restore-scripts/mondo
-restoremondo_SCRIPTS = mr-grub mr-hack-fstab mr-hack-lilo mr-hack-elilo \
+restoremondo_SCRIPTS = mr-grub mr-hack-fstab mr-hack-lilo \
                         mr-label-partitions-as-necessary \
                         mr-make-me-bootable mr-mount-me mr-mount-subroutine-me mr-raw \
-                        mr-stabgrub-me mr-stablilo-me mr-stabelilo-me \
+                        mr-stabgrub-me mr-stablilo-me \
                         mr-stabraw-me mr-unmount-me