Changeset 2488 in MondoRescue for branches/2.2.10/mondo

Timestamp:

Nov 18, 2009, 9:41:00 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3621@localhost: bruno | 2009-11-18 10:53:33 +0100

• PrepareBootDiskImage replaces previously duplicated functions for lilo/isolinux handling and completely re-written
• remove useless rootfs files
• Use MINDI_CACHE instead of /tmp globally

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-rstr-compare.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (1 diff)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -653 +653 @@
 
     mr_free(bkpinfo->media_device);
-    if (bkpinfo->disaster_recovery && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-        bkpinfo->media_device = last_line_of_file("/tmp/CDROM-LIVES-HERE");
+    if (bkpinfo->disaster_recovery && does_file_exist(MINDI_CACHE"/CDROM-LIVES-HERE")) {
+        bkpinfo->media_device = last_line_of_file(MINDI_CACHE"/CDROM-LIVES-HERE");
     } else {
         bkpinfo->media_device = find_cdrom_device(FALSE);

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -604 +604 @@
     } else {
         mr_free(bkpinfo->media_device);
-        if (bkpinfo->disaster_recovery && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-            bkpinfo->media_device = last_line_of_file("/tmp/CDROM-LIVES-HERE");
+        if (bkpinfo->disaster_recovery && does_file_exist(MINDI_CACHE"/CDROM-LIVES-HERE")) {
+            bkpinfo->media_device = last_line_of_file(MINDI_CACHE"/CDROM-LIVES-HERE");
         } else {
             bkpinfo->media_device = find_cdrom_device(TRUE);