Changeset 3428 in MondoRescue

Timestamp:

Aug 27, 2015, 2:48:37 AM (9 years ago)

Author:

Bruno Cornec

Message:

Also copy EFI|boot dir to the ISO directly

Location:

branches/3.2

Files:

• mindi/mindi (modified) (2 diffs)
• mondo/src/mondoarchive/mondoarchive.c (modified) (1 diff)

branches/3.2/mindi/mindi

@@ -1943 +1943 @@
     [ -e "$MINDI_LIB/memdisk" ] && cp -f $MINDI_LIB/memdisk $mountpoint 2>> $LOGFILE
 
-    #cp `dirname $kernelpath`/*.efi $mountpoint 2>> $LOGFILE
+    # copy boot stuff now generated in PrepareDataDiskImage
+    if [ "$BOOT_TYPE" = "UEFI" ]; then
+        (cd $mountpoint ; tar xfz $MINDI_CACHE/all.tar.gz ./EFI)
+    else
+        (cd $mountpoint ; tar xfz $MINDI_CACHE/all.tar.gz ./boot)
+    fi
+
     umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
     echo -en "..."
@@ -3275 +3281 @@
 fi
 if [ -f $MINDI_LIB/rootfs/usr/bin/busybox ]; then
-    LogIt "INFO: Mindi-`$MINDI_LIB/rootfs/usr/bin/busybox 2>&1 | head -1`"
+    LogIt "INFO: You are using Mindi-`$MINDI_LIB/rootfs/usr/bin/busybox 2>&1 | head -1`"
 else
     LogIt "ERROR: Unable to find mindi-busybox, please install it"

branches/3.2/mondo/src/mondoarchive/mondoarchive.c

@@ -384 +384 @@
 /* Report result of entire operation (success? errors?) */
     if (!retval) {
-        mvaddstr_and_log_it(g_currentY++, 0,
-                            "Backup and/or verify ran to completion. Everything appears to be fine.");
+        mvaddstr_and_log_it(g_currentY++, 0, "Backup and/or verify ran to completion. Everything appears to be fine.");
     } else {
-        mvaddstr_and_log_it(g_currentY++, 0,
-                            "Backup and/or verify ran to completion. However, errors did occur.");
+        mvaddstr_and_log_it(g_currentY++, 0, "Backup and/or verify ran to completion. However, errors did occur.");
     }
 
     if (does_file_exist(MINDI_CACHE"/mondorescue.iso")) {
-        log_to_screen
-            (MINDI_CACHE"/mondorescue.iso, a boot/utility CD, is available if you want it.");
+        log_to_screen(MINDI_CACHE"/mondorescue.iso, a boot/utility CD, is available if you want it.");
     }