Changeset 3564 in MondoRescue for branches/3.2/mondo/src/common

Timestamp:

Apr 12, 2016, 3:37:06 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Fix previous logfile copy on target media
• Rename libmondo-mountlist.c as mondo-rstr-mountlist.c with corresponding includes as this is only used by mondorestore and update build process for that.

Location:

branches/3.2/mondo/src/common

Files:

• Makefile.am (modified) (2 diffs)
• libmondo-archive.c (modified) (2 diffs)
• libmondo-fork.c (modified) (1 diff)
• libmondo.h (modified) (1 diff)

branches/3.2/mondo/src/common/Makefile.am

@@ -10 +10 @@
 libmondo_a_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
                        libmondo-filelist.c libmondo-files.c libmondo-fork.c \
-                       libmondo-mountlist.c libmondo-raid.c \
+                       libmondo-raid.c \
                        libmondo-stream.c libmondo-string.c libmondo-tools.c \
                        libmondo-verify.c newt-specific.c libmondo-cli.c \
                        libmondo-archive.h libmondo-devices.h \
                        libmondo-filelist.h libmondo-files.h libmondo-fork.h \
-                       libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
+                       libmondo-gui.h libmondo-raid.h \
                        libmondo-stream.h libmondo-string.h libmondo-tools.h \
                        libmondo-verify.h libmondo-fifo.h libmondo-cli.h \
@@ -22 +22 @@
                        libmondo-files-EXT.h libmondo-fork-EXT.h \
                        libmondo-gui-EXT.h libmondo-filelist-EXT.h \
-                       libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
+                       libmondo-raid-EXT.h  \
                        libmondo-string-EXT.h libmondo-tools-EXT.h \
                        libmondo-verify-EXT.h  libmondo-stream-EXT.h libmondo-cli-EXT.h \

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

@@ -14 +14 @@
 #include "mr_mem.h"
 #include "mr_str.h"
+#include "mr_sys.h"
 #include "mondostructures.h"
 #include "libmondo-string-EXT.h"
@@ -1516 +1517 @@
 
     /*  Copy the current logfile - of course incomplete to the media */
-    mr_system("gzip -c9 %s > %s/archives/%d.%s", MONDO_LOGFILE, tmp1, cd_number_str, MONDO_LOGFILE);
+    mr_system("gzip -c9 %s > %s/archives/%s", MONDO_LOGFILE, tmp1, MONDO_LOGFILE);
 
     if (is_this_device_mounted(bkpinfo->media_device)) {

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

@@ -9 +9 @@
 #include "mr_mem.h"
 #include "mr_str.h"
+#include "mr_sys.h"
 #include "mondostructures.h"
 #include "libmondo-fork.h"

branches/3.2/mondo/src/common/libmondo.h

@@ -10 +10 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-gui-EXT.h"
-#include "libmondo-mountlist-EXT.h"
 #include "libmondo-raid-EXT.h"
 #include "libmondo-stream-EXT.h"