Changeset 3889 in MondoRescue for branches

Timestamp:

Mar 10, 2024, 8:22:38 PM (3 months ago)

Author:

Bruno Cornec

Message:

Remove EFI references for ia64

Location:

branches/3.3

Files:

• contrib/mkcd/setup (modified) (1 diff)
• mindi/mindi (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (1 diff)
• mondo/src/common/libmondo-tools.c (modified) (1 diff)
• mondo/src/common/mondostructures.h (modified) (1 diff)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (1 diff)

branches/3.3/contrib/mkcd/setup

@@ -296 +296 @@
 GetDistroArchitecture() {
     local arch
-    for arch in x86_64 x86-64 amd64 opteron ia64 ; do
+    for arch in x86_64 x86-64 amd64 opteron ; do
     if grep -i "$arch" /etc/issue.net &> /dev/null ; then
 #       [ "$arch" = "x86_64" ] && arch=amd64; # hack - FIXME
         echo $arch
-        return 0
-    fi
-    done
-
-    for arch in itanium ; do
-    if grep -i "$arch" /etc/issue.net &> /dev/null ; then
-        echo itan
         return 0
     fi

branches/3.3/mindi/mindi

@@ -2198 +2198 @@
                     mount /boot/efi
                     if [ $? -ne 0 ]; then
-                        echo "ERROR: You have to mount your (U)EFI partition when using mindi"
+                        echo "ERROR: You have to mount your UEFI partition when using mindi"
                         MindiExit -1
                     fi

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

@@ -2650 +2650 @@
     if (bkpinfo->boot_type == UEFI) {
         mr_asprintf(boot_type, "UEFI");
-    } else if (bkpinfo->boot_type == EFI) {
-        mr_asprintf(boot_type, "EFI");
     } else if (bkpinfo->boot_type == BIOS) {
         mr_asprintf(boot_type, "BIOS");

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

@@ -1764 +1764 @@
 
 /**
- * Return the type of boot of the system (UEFI, EFI or BIOS)
+ * Return the type of boot of the system (UEFI or BIOS)
  */
 t_boot mr_boot_type(void) {

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

@@ -687 +687 @@
     if (!run_program_and_log_output("mount | grep -Ew 'vfat|fat|dos' | grep -vE \"/dev/fd|nexdisk\"", 0)) {
         if (!run_program_and_log_output("mount | grep -Ew 'vfat|fat|dos' | grep -Ew efi", 0)) {
-            log_to_screen("I think you have a EFI/UEFI partition.");
+            log_to_screen("I think you have a UEFI partition.");
         } else {
             log_to_screen("I think you have a Windows 9x partition.");

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

@@ -184 +184 @@
 typedef enum { 
     BIOS,                       /// System uses Legacy Boot mode (aka BIOS)
-    EFI,                        /// System uses EFI Boot mode
     UEFI,                       /// System uses UEFI Boot mode
 } t_boot;

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

@@ -1134 +1134 @@
 if (!strcmp(value, "BIOS")) {
     bkpinfo->boot_type = BIOS;
-} else if (!strcmp(value, "EFI")) {
-    bkpinfo->boot_type = EFI;
 } else if (!strcmp(value, "UEFI")) {
     bkpinfo->boot_type = UEFI;