Changeset 3883 in MondoRescue for branches/3.3/mondo

Timestamp:

Mar 10, 2024, 12:58:41 AM (4 months ago)

Author:

Bruno Cornec

Message:

Remove the possibility to have non bootable media

Location:

branches/3.3/mondo/src

Files:

• common/libmondo-archive.c (modified) (9 diffs)
• common/libmondo-cli.c (modified) (1 diff)
• common/libmondo-devices.c (modified) (2 diffs)
• common/libmondo-tools.c (modified) (4 diffs)
• common/mondostructures.h (modified) (1 diff)
• include/my-stuff.h (modified) (1 diff)

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

@@ -370 +370 @@
  * @param bkpinfo The backup information structure. Fields used:
  * - @c backup_media_type
- * - @c nonbootable_backup
  * - @c scratchdir
  *
@@ -431 +430 @@
     mr_free(tmp);
 
-    if (bkpinfo->nonbootable_backup) {
-        log_msg(1, "Making nonbootable USB backup not implemented yet");
-    } else {
-        log_msg(1, "Making bootable backup");
-
-        /* Command to execute */
-        mr_asprintf(tmp,"cd %s ; rm -fr %s/syslinux ; mv * %s", bkpinfo->scratchdir, tmp1, tmp1); 
-        res = eval_call_to_make_USB(tmp, message_to_screen);
-        if (res) {
-            mr_asprintf(result_sz, "%s ...failed",tmp);
-        } else {
-            mr_asprintf(result_sz, "%s ...OK",tmp);
-        }
-        log_to_screen(result_sz);
-        mr_free(result_sz);
-        mr_free(tmp);
-        retval += res;
-
-        /* Recreate the required structure under the scratch dir */
-        mr_asprintf(tmp,"mkdir %s/archive", bkpinfo->scratchdir); 
-        run_program_and_log_output(tmp, FALSE);
-        mr_free(tmp);
-    }
+    log_msg(1, "Making bootable backup");
+
+    /* Command to execute */
+    mr_asprintf(tmp,"cd %s ; rm -fr %s/syslinux ; mv * %s", bkpinfo->scratchdir, tmp1, tmp1); 
+    res = eval_call_to_make_USB(tmp, message_to_screen);
+    if (res) {
+        mr_asprintf(result_sz, "%s ...failed",tmp);
+    } else {
+        mr_asprintf(result_sz, "%s ...OK",tmp);
+    }
+    log_to_screen(result_sz);
+    mr_free(result_sz);
+    mr_free(tmp);
+    retval += res;
+
+    /* Recreate the required structure under the scratch dir */
+    mr_asprintf(tmp,"mkdir %s/archive", bkpinfo->scratchdir); 
+    run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
     paranoid_free(message_to_screen);
 
@@ -690 +685 @@
  * - @c make_cd_use_lilo
  * - @c manual_cd_tray
- * - @c nonbootable_backup
  * - @c scratchdir
  *
@@ -850 +844 @@
         }
         mr_free(tmp);
-        if (bkpinfo->nonbootable_backup) {
-            log_msg(1, "Making nonbootable backup");
-            mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS);
+        log_msg(1, "Making bootable backup");
+
+#ifdef __FreeBSD__
+        bkpinfo->make_cd_use_lilo = TRUE;
+#endif
+
+
+        log_msg(1, "make_cd_use_lilo is actually %d", bkpinfo->make_cd_use_lilo);
+        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, "Making bootable backup");
-
-#ifdef __FreeBSD__
-            bkpinfo->make_cd_use_lilo = TRUE;
-#endif
-
-
-            log_msg(1, "make_cd_use_lilo is actually %d", bkpinfo->make_cd_use_lilo);
-            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
+            log_msg(1, "make_cd_use_lilo = FALSE");
+            log_msg(1, "Isolinux");
+            if (bkpinfo->boot_type == UEFI) {
+                if (strstr(isofs_cmd,"xorriso")) {
+                    /*  xorriso needs another '-' before efi-boot */
+                    mr_asprintf(uefistr, "%s -%s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
+                } else {
+                    mr_asprintf(uefistr, "%s %s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
+                }
             } else {
-                log_msg(1, "make_cd_use_lilo = FALSE");
-                log_msg(1, "Isolinux");
-                if (bkpinfo->boot_type == UEFI) {
-                    if (strstr(isofs_cmd,"xorriso")) {
-                        /*  xorriso needs another '-' before efi-boot */
-                        mr_asprintf(uefistr, "%s -%s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
-                    } else {
-                        mr_asprintf(uefistr, "%s %s", MONDO_UEFI_PREFIX, MONDO_MKISOFS_UEFI);
-                    }
-                } else {
-                    mr_asprintf(uefistr, "%s",MONDO_MKISOFS_CMS);
-                }
-                mr_asprintf(full_isofs_cmd, "%s%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);
-                mr_free(uefistr);
-
-                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
-                mr_free(full_isofs_cmd);
-            }
+                mr_asprintf(uefistr, "%s",MONDO_MKISOFS_CMS);
+            }
+            mr_asprintf(full_isofs_cmd, "%s%s%s-o '_ISO_' .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX,uefistr);
+            mr_free(uefistr);
+
+            res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, message_to_screen);
+            mr_free(full_isofs_cmd);
         }
         mr_free(isofs_cmd);
@@ -2572 +2559 @@
  * - @c media_device
  * - @c media_size
- * - @c nonbootable_backup
  * - @c scratchdir
  * - @c tmpdir
@@ -2705 +2691 @@
 
     update_evalcall_form(2);
-    if (!bkpinfo->nonbootable_backup && (bkpinfo->boot_loader == '\0' || bkpinfo->boot_device == NULL)) {
+    if ((bkpinfo->boot_loader == '\0') || (bkpinfo->boot_device == NULL)) {
 
 #ifdef __FreeBSD__
@@ -2762 +2748 @@
            bkpinfo->boot_loader != 'E' &&
 #endif
-           bkpinfo->boot_loader != 'L' && bkpinfo->boot_loader != 'G' && bkpinfo->boot_loader != 'R' && !bkpinfo->nonbootable_backup) {
+           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.");
     }
@@ -2978 +2964 @@
     mr_free(value);
 
-    /* This parameter is always the last one and optional */
-    if (bkpinfo->nonbootable_backup) {
-        mr_strcat(command, " NONBOOTABLE");
-    }
     log_msg(2, command);
 
@@ -2996 +2978 @@
     log_msg(1, "End of call to mindi");
 
-    if (bkpinfo->nonbootable_backup) {
-        res = 0;
-    }                           // hack
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
 
-        if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(command, "cp -f %s/all.tar.gz %s/images", bkpinfo->tmpdir, bkpinfo->scratchdir);
-            if (system(command)) {
-                mr_free(command);
-                fatal_error("Unable to create temporary all tarball");
-            }
-            mr_free(command);
-        }
         /* For USB we already have everything on the key */
         if (bkpinfo->backup_media_type == usb) {

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

@@ -260 +260 @@
         }
         mr_free(tmp);
-    }
-
-    if ((flag_set['W']) && (! bkpinfo->restore_data)) {
-        bkpinfo->nonbootable_backup = TRUE;
-        log_to_screen("Warning - you have opted for non-bootable backup");
-        if (flag_set['f'] || flag_set['l']) {
-            log_to_screen
-                ("You don't need to specify bootloader or bootdevice");
-        }
     }
 

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

@@ -2010 +2010 @@
     malloc_string(tmp1);
     assert(bkpinfo != NULL);
-    bkpinfo->nonbootable_backup = FALSE;
 
     // Tape, CD, NETFS, ...?
@@ -2100 +2099 @@
 
             mr_asprintf(comment, "How much data (in Megabytes) will each %s store?", mds);
-            tmp1 = popup_and_get_string("Size", comment, sz_size, 5)) {
+            tmp1 = mr_popup_and_get_string("Size", comment, sz_size);
             if (!tmp1) {
                 log_to_screen("User has chosen not to backup the machine");

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

@@ -352 +352 @@
  * - Used: @c bkpinfo->media_device
  * - Used: @c bkpinfo->netfs_mount
- * - Used: @c bkpinfo->nonbootable_backup
  * - Used: @c bkpinfo->scratchdir
  * - Used: @c bkpinfo->tmpdir
@@ -437 +436 @@
             fatal_error("Please install growisofs.");
         }
-        if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
-        } else if
+        if
 #ifdef __FreeBSD__
             (TRUE)
@@ -506 +503 @@
         mr_free(tmp);
 
-        if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(mondo_mkisofs_sz, "%s%s", isofs_cmd, MONDO_MKISOFS);
-        } else if
+        if
 #ifdef __FreeBSD__
             (TRUE)
@@ -990 +985 @@
     bkpinfo->please_dont_eject = FALSE;
     bkpinfo->manual_cd_tray = FALSE;
-    bkpinfo->nonbootable_backup = FALSE;
     bkpinfo->make_cd_use_lilo = FALSE;
     bkpinfo->use_obdr = FALSE;

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

@@ -618 +618 @@
    */
     bool manual_cd_tray;
-
-  /**
-   * If TRUE, do not make the first CD bootable. This is dangerous but it saves a minute
-   * or so. It is useful in testing. Use with care.
-   */
-    bool nonbootable_backup;
 
   /**

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

@@ -218 +218 @@
      */
 #define MONDO_GROWISOFS_REGULAR_LILO     "growisofs "MONDO_MKISOFS_REGULAR_SYSLINUX
-
-/**
- * @c growisofs command to generate a nonbootable DVD, except for the directory to image.
- */
-#define MONDO_GROWISOFS_NONBOOT          "growisofs -use-the-force-luke "MONDO_MKISOFS
 
 /**