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

Timestamp:

Mar 10, 2024, 7:23:12 PM (18 months ago)

Author:

Bruno Cornec

Message:

Removes support for ia64 depracated in upstream kernel, and elilo

Location:

branches/3.3/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (3 diffs)
• mondo-rstr-tools-EXT.h (modified) (1 diff)
• mondo-rstr-tools.c (modified) (3 diffs)
• mondorestore.c (modified) (1 diff)

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.");