Changeset 3527 in MondoRescue

Timestamp:

Mar 4, 2016, 6:47:07 AM (8 years ago)

Author:

Bruno Cornec

Message:

Improve mondoarchive/mindi interface

• Rename the mindi image mindi.iso (was mondorescue.iso which was confusing)
• If called from mondoarchive, mindi now copies as well kernel and initrd to the boot image

Location:

branches/3.2

Files:

• mindi/mindi (modified) (1 diff)
• mondo-doc/mondorescue-howto.sgml (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (1 diff)
• mondo/src/common/libmondo-stream.c (modified) (1 diff)
• mondo/src/mondoarchive/mondoarchive.c (modified) (1 diff)

branches/3.2/mindi/mindi

@@ -1570 +1570 @@
     fi
     cp -f $MONDO_SHARE/autorun $MINDI_TMP/target 2>> $LOGFILE
+    cp -f $MINDI_TMP/target/vmlinuz $MONDO_ROOT 2>> $LOGFILE
+    if [ "$?" -ne "0" ] ; then
+        LogAll "ERROR: Failed to copy $MINDI_TMP/vmlinuz to $MONDO_ROOT"
+        LogAll "       Please check the target directory."
+        retval=$(($retval+1))
+    fi
+    cp -f $MINDI_TMP/target/initrd.img $MONDO_ROOT 2>> $LOGFILE
+    if [ "$?" -ne "0" ] ; then
+        LogAll "ERROR: Failed to copy $MINDI_TMP/initrd.img to $MONDO_ROOT"
+        LogAll "       Please check the target directory."
+        retval=$(($retval+1))
+    fi
 fi
 

branches/3.2/mondo-doc/mondorescue-howto.sgml

@@ -1513 +1513 @@
 to restore over a network by default, which is silly because the
 archives are on the CD's). Or, you can boot from the Mindi media
-(or mondorescue.iso) and hit ENTER a few times to restore.</para>
+(mindi.iso) and hit ENTER a few times to restore.</para>
 <para>Those ISO images can also be used for a PXE restore. For this 
         to work, please refer to the file README.pxe provided with 

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

@@ -850 +850 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        mr_asprintf(command, "cp -f %s/images/mindi.iso %s/mondorescue.iso", bkpinfo->scratchdir, MINDI_CACHE);
-        log_msg(2, command);
-        run_program_and_log_output(command, FALSE);
-        mr_free(command);
 
         if (bkpinfo->nonbootable_backup) {

branches/3.2/mondo/src/common/libmondo-stream.c

@@ -735 +735 @@
     set_tape_block_size_with_mt(2048);
 
-    mr_asprintf(command, "dd if=%s of=%s bs=2048",MINDI_CACHE"/mondorescue.iso",bkpinfo->media_device);
+    mr_asprintf(command, "dd if=%s of=%s bs=2048",MINDI_CACHE"/mindi.iso",bkpinfo->media_device);
     res += run_program_and_log_output(command, 1);
     paranoid_free(command);

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

@@ -385 +385 @@
     }
 
-    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.");
+    if (does_file_exist(MINDI_CACHE"/mindi.iso")) {
+        log_to_screen(MINDI_CACHE"/mindi.iso, a boot/utility CD, is available if you want it.");
     }