Changeset 3885 in MondoRescue for branches/3.3/mondo/src/common/libmondo-devices.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-devices.c (modified) (6 diffs)

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