Changeset 2462 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-files.c

Timestamp:

Oct 20, 2009, 4:07:00 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3548@localhost: bruno | 2009-10-16 19:18:27 +0200

• mindi now boots in a QEMU VM without busybox
• mindi is now noarch as a consequence
• MINDI_LIB becomes MINDI_DATA for coherency and as a consequence
• CACHEDIR becomes MINDI_CACHE for coherency and it's a build parameter and not hardcoded anymore in mindi
• THat variable is also used at restore time for mondorestore.cfg e.g.
• FAILSAFE kernel is gone. Just use another kernel of your choice. Most std kernels work anyway
• TurnTgzIntoRdz rewritten and now really computes data disk size and not suppose its size
• Interface mondo/mindi changed again => incompatible
• Non-bootable media not supported anymore.
• Mondorescue adapted to these changes but not tested yet
• Doc updated as well

File:

• branches/2.2.10/mondo/src/common/libmondo-files.c (modified) (4 diffs)

branches/2.2.10/mondo/src/common/libmondo-files.c

@@ -705 +705 @@
 
 /**
- * Determine the size (in KB) of @p dev in the mountlist in <tt>tmpdir</tt>/mountlist.txt.
+ * Determine the size (in KB) of @p dev in the mountlist in mountlist.txt.
  * @param tmpdir The tempdir where the mountlist is stored.
  * @param dev The device to search for.
@@ -717 +717 @@
     long file_len_K;
 
-    mr_asprintf(mountlist, "%s/mountlist.txt", tmpdir);
-    mr_asprintf(command, "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'", dev, tmpdir);
+    mr_asprintf(mountlist, "%s/mountlist.txt", MINDI_CACHE);
+    mr_asprintf(command, "grep \"%s \" %s/mountlist.txt | head -n1 | awk '{print $4}'", dev, MINDI_CACHE);
     mr_free(mountlist);
 
@@ -992 +992 @@
  * Copy the files that Mondo/Mindi need to run to the scratchdir or tempdir.
  * Currently this includes: copy Mondo's home directory to scratchdir, 
- * copy LAST-FILELIST-NUMBER to scratchdir, copy post-nuke.tgz (if it exists) to tmpdir, 
+ * copy post-nuke.tgz (if it exists) to tmpdir, 
  * and run "hostname > scratchdir/HOSTNAME".
  * @param bkpinfo The backup information structure. Fields used:
@@ -1020 +1020 @@
     if (res) {
         fatal_error("Failed to copy Mondo's stuff to scratchdir");
-    }
-
-    mr_asprintf(command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir, bkpinfo->scratchdir);
-    res = run_program_and_log_output(command, FALSE);
-    mr_free(command);
-
-    if (res) {
-        fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
     }