Changeset 1079 in MondoRescue for trunk/mondo/src/mondorestore


Ignore:
Timestamp:
Jan 28, 2007, 5:58:18 PM (18 years ago)
Author:
Bruno Cornec
Message:

merge -r1045:1078 £SVN_M/branches/stable

Location:
trunk/mondo/src/mondorestore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/mondo/src/mondorestore/Makefile.am

    r900 r1079  
     1## $Id$
     2##
    13## $Id$
    24##
    35## Process with Automake to generate Makefile.in
    46##
     7AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include
    58
    69AM_CPPFLAGS = -DMONDO_CONF_DIR=\"$(sysconfdir)\" -I${top_builddir}/src/include

  • trunk/mondo/src/mondorestore/mondo-restore.c

    r1043 r1079  
    11/***************************************************************************
    2  * $Id$
    3  */
     2$Id$
     3restores mondoarchive data
     4***************************************************************************/
    45
    56/**
    … …  
    21562157            mr_free(tarball_fname);
    21572158            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo",
     2159                current_tarball_number);
     2160        }
     2161        if (!does_file_exist(tarball_fname)) {
     2162            mr_free(tarball_fname);
     2163            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.gz",
    21582164                    current_tarball_number);
    21592165        }

  • trunk/mondo/src/mondorestore/mondo-rstr-tools.h

    r914 r1079  
    99void kill_petris(void);
    1010int mount_cdrom(struct s_bkpinfo *bkpinfo);
     11int mount_device(char *, char *, char *, bool);
    1112int mount_all_devices(struct mountlist_itself *, bool);
    1213void protect_against_braindead_sysadmins(void);
Note: See TracChangeset for help on using the changeset viewer.