Changeset 3564 for branches


Ignore:
Timestamp:
Apr 12, 2016, 3:37:06 PM (3 years ago)
Author:
bruno
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
Files:
10 edited
3 moved

Legend:

Unmodified
Added
Removed
  • branches/3.2/mondo/src/common/Makefile.am

    r2241 r3564  
    1010libmondo_a_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
    1111                       libmondo-filelist.c libmondo-files.c libmondo-fork.c \
    12                        libmondo-mountlist.c libmondo-raid.c \
     12                       libmondo-raid.c \
    1313                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
    1414                       libmondo-verify.c newt-specific.c libmondo-cli.c \
    1515                       libmondo-archive.h libmondo-devices.h \
    1616                       libmondo-filelist.h libmondo-files.h libmondo-fork.h \
    17                        libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
     17                       libmondo-gui.h libmondo-raid.h \
    1818                       libmondo-stream.h libmondo-string.h libmondo-tools.h \
    1919                       libmondo-verify.h libmondo-fifo.h libmondo-cli.h \
     
    2222                       libmondo-files-EXT.h libmondo-fork-EXT.h \
    2323                       libmondo-gui-EXT.h libmondo-filelist-EXT.h \
    24                        libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
     24                       libmondo-raid-EXT.h  \
    2525                       libmondo-string-EXT.h libmondo-tools-EXT.h \
    2626                       libmondo-verify-EXT.h  libmondo-stream-EXT.h libmondo-cli-EXT.h \
  • branches/3.2/mondo/src/common/libmondo-archive.c

    r3560 r3564  
    1414#include "mr_mem.h"
    1515#include "mr_str.h"
     16#include "mr_sys.h"
    1617#include "mondostructures.h"
    1718#include "libmondo-string-EXT.h"
     
    15161517
    15171518    /*  Copy the current logfile - of course incomplete to the media */
    1518     mr_system("gzip -c9 %s > %s/archives/%d.%s", MONDO_LOGFILE, tmp1, cd_number_str, MONDO_LOGFILE);
     1519    mr_system("gzip -c9 %s > %s/archives/%s", MONDO_LOGFILE, tmp1, MONDO_LOGFILE);
    15191520
    15201521    if (is_this_device_mounted(bkpinfo->media_device)) {
  • branches/3.2/mondo/src/common/libmondo-fork.c

    r3560 r3564  
    99#include "mr_mem.h"
    1010#include "mr_str.h"
     11#include "mr_sys.h"
    1112#include "mondostructures.h"
    1213#include "libmondo-fork.h"
  • branches/3.2/mondo/src/common/libmondo.h

    r541 r3564  
    1010#include "libmondo-fork-EXT.h"
    1111#include "libmondo-gui-EXT.h"
    12 #include "libmondo-mountlist-EXT.h"
    1312#include "libmondo-raid-EXT.h"
    1413#include "libmondo-stream-EXT.h"
  • branches/3.2/mondo/src/mondorestore/Makefile.am

    r3411 r3564  
    99noinst_HEADERS        = mondorestore.h mondo-rstr-compare.h mondo-rstr-newt.h mondo-rstr-tools.h \
    1010                        mondorestore-EXT.h mr-externs.h \
    11                         mondo-rstr-compare-EXT.h mondo-rstr-tools-EXT.h mondoprep.h
     11                        mondo-rstr-compare-EXT.h mondo-rstr-tools-EXT.h mondoprep.h \
     12                        libmondo-mountlist.h libmondo-mountlist-EXT.h \
    1213                        mondorestore.h
    1314
     
    1516sbin_PROGRAMS         = mondorestore
    1617mondorestore_SOURCES  = mondo-prep.c mondorestore.c mondo-rstr-newt.c \
    17                         mondo-rstr-compare.c mondo-rstr-tools.c ../common/newt-specific.c
     18                        mondo-rstr-compare.c mondo-rstr-tools.c ../common/newt-specific.c mondo-rstr-mountlist.c
    1819mondorestore_LDADD    = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
  • branches/3.2/mondo/src/mondorestore/mondo-prep.c

    r3542 r3564  
    1212#include "../common/libmondo-tools-EXT.h"
    1313#include "mondo-rstr-tools-EXT.h"
     14#include "libmondo-mountlist-EXT.h"
    1415#include <sys/ioctl.h>
    1516#include <linux/hdreg.h>
  • branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

    r3544 r3564  
    1212#include "mr-externs.h"
    1313#include "mondo-rstr-tools.h"
     14#include "libmondo-mountlist-EXT.h"
    1415
    1516/**
  • branches/3.2/mondo/src/mondorestore/mondorestore.c

    r3544 r3564  
    1818#include "mondo-rstr-compare-EXT.h"
    1919#include "mondo-rstr-tools-EXT.h"
     20#include "libmondo-mountlist-EXT.h"
    2021#include <utime.h>
    2122
  • branches/3.2/mondo/test/Makefile.am

    r3498 r3564  
    66mrtest_PROGRAMS           = mrtest_mountlist mrtest_truncname mrtest_stresc mrtest_str_substitute mrtest_mr_system
    77
    8 mrtest_mountlist_SOURCES  = test-mountlist.c ${top_builddir}/src/mondorestore/mondo-prep.c ${top_builddir}/src/mondorestore/mondo-rstr-newt.c ${top_builddir}/src/mondorestore/mondo-rstr-tools.c
     8mrtest_mountlist_SOURCES  = test-mountlist.c ${top_builddir}/src/mondorestore/mondo-prep.c ${top_builddir}/src/mondorestore/mondo-rstr-newt.c ${top_builddir}/src/mondorestore/mondo-rstr-tools.c ${top_builddir}/src/mondorestore/mondo-rstr-mountlist.c
    99mrtest_mountlist_LDADD    = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
    1010
  • branches/3.2/mondo/test/test-mountlist.c

    r3374 r3564  
    1212#include "../mondorestore/mondorestore.h"
    1313#include "../mondorestore/mr-externs.h"
     14#include "../mondorestore/libmondo-mountlist-EXT.h"
     15
    1416
    1517#define RAIDTAB_TEST "/tmp/raidtab"
Note: See TracChangeset for help on using the changeset viewer.