Hello community, here is the log from the commit of package fsarchiver for openSUSE:Factory checked in at 2013-03-03 21:05:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fsarchiver (Old) and /work/SRC/openSUSE:Factory/.fsarchiver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fsarchiver", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/fsarchiver/fsarchiver.changes 2013-02-09 10:04:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fsarchiver.new/fsarchiver.changes 2013-03-03 21:05:49.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Feb 28 14:29:33 UTC 2013 - [email protected] + +- Update to 0.6.17. + + Implemented "mkfsopt" restfs option to pass extra options to + mkfs. + + Fixed parsing of "/proc/self/mountinfo" (mount options were not + parsed on new systems). + +------------------------------------------------------------------- Old: ---- fsarchiver-0.6.16.tar.gz New: ---- fsarchiver-0.6.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fsarchiver.spec ++++++ --- /var/tmp/diff_new_pack.9Kfi8a/_old 2013-03-03 21:05:51.000000000 +0100 +++ /var/tmp/diff_new_pack.9Kfi8a/_new 2013-03-03 21:05:51.000000000 +0100 @@ -17,7 +17,7 @@ Name: fsarchiver -Version: 0.6.16 +Version: 0.6.17 Release: 0 Summary: Filesystem Archiver License: GPL-2.0 ++++++ fsarchiver-0.6.16.tar.gz -> fsarchiver-0.6.17.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/ChangeLog new/fsarchiver-0.6.17/ChangeLog --- old/fsarchiver-0.6.16/ChangeLog 2013-02-07 19:49:08.000000000 +0100 +++ new/fsarchiver-0.6.17/ChangeLog 2013-02-25 20:29:25.000000000 +0100 @@ -1,5 +1,9 @@ fsarchiver: Filesystem Archiver for Linux [http://www.fsarchiver.org] ===================================================================== +* 0.6.17 (2013-02-25): + - Implemented "mkfsopt" restfs option to pass extra options to mkfs (Michael Moninski) + - Fixed parsing of "/proc/self/mountinfo" (mount options were not parsed on new systems) + - Removed the ebuild for gentoo as fsarchiver is now in the official portage tree * 0.6.16 (2013-02-07): - Fixed mke2fs requirement for the "ext_attr" feature (affects RHLE5/CentOS5) - Fixed parsing of "/proc/self/mountinfo" for systemd based systems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/configure new/fsarchiver-0.6.17/configure --- old/fsarchiver-0.6.16/configure 2013-02-07 19:49:20.000000000 +0100 +++ new/fsarchiver-0.6.17/configure 2013-02-25 20:29:44.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for fsarchiver 0.6.16. +# Generated by GNU Autoconf 2.63 for fsarchiver 0.6.17. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -594,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='fsarchiver' PACKAGE_TARNAME='fsarchiver' -PACKAGE_VERSION='0.6.16' -PACKAGE_STRING='fsarchiver 0.6.16' +PACKAGE_VERSION='0.6.17' +PACKAGE_STRING='fsarchiver 0.6.17' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -1334,7 +1334,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures fsarchiver 0.6.16 to adapt to many kinds of systems. +\`configure' configures fsarchiver 0.6.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1405,7 +1405,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of fsarchiver 0.6.16:";; + short | recursive ) echo "Configuration of fsarchiver 0.6.17:";; esac cat <<\_ACEOF @@ -1523,7 +1523,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -fsarchiver configure 0.6.16 +fsarchiver configure 0.6.17 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1537,7 +1537,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by fsarchiver $as_me 0.6.16, which was +It was created by fsarchiver $as_me 0.6.17, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -1907,7 +1907,7 @@ cat >>confdefs.h <<\_ACEOF -#define PACKAGE_RELDATE "2013-02-07" +#define PACKAGE_RELDATE "2013-02-25" _ACEOF @@ -1927,7 +1927,7 @@ cat >>confdefs.h <<\_ACEOF -#define PACKAGE_VERSION_C 16 +#define PACKAGE_VERSION_C 17 _ACEOF @@ -2543,7 +2543,7 @@ # Define the identity of the package. PACKAGE='fsarchiver' - VERSION='0.6.16' + VERSION='0.6.17' cat >>confdefs.h <<_ACEOF @@ -8989,7 +8989,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by fsarchiver $as_me 0.6.16, which was +This file was extended by fsarchiver $as_me 0.6.17, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9052,7 +9052,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -fsarchiver config.status 0.6.16 +fsarchiver config.status 0.6.17 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/configure.ac new/fsarchiver-0.6.17/configure.ac --- old/fsarchiver-0.6.16/configure.ac 2013-02-07 19:49:08.000000000 +0100 +++ new/fsarchiver-0.6.17/configure.ac 2013-02-25 20:27:27.000000000 +0100 @@ -3,12 +3,12 @@ AC_PREREQ(2.59) -AC_INIT([fsarchiver], 0.6.16) -AC_DEFINE([PACKAGE_RELDATE], "2013-02-07", [Define the date of the release]) +AC_INIT([fsarchiver], 0.6.17) +AC_DEFINE([PACKAGE_RELDATE], "2013-02-25", [Define the date of the release]) AC_DEFINE([PACKAGE_FILEFMT], "FsArCh_002", [Define the version of the file format]) AC_DEFINE([PACKAGE_VERSION_A], 0, [Major version number]) AC_DEFINE([PACKAGE_VERSION_B], 6, [Medium version number]) -AC_DEFINE([PACKAGE_VERSION_C], 16, [Minor version number]) +AC_DEFINE([PACKAGE_VERSION_C], 17, [Minor version number]) AC_DEFINE([PACKAGE_VERSION_D], 0, [Patch version number]) AC_CANONICAL_HOST([]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/distrib/gentoo/fsarchiver-x.y.z.ebuild new/fsarchiver-0.6.17/distrib/gentoo/fsarchiver-x.y.z.ebuild --- old/fsarchiver-0.6.16/distrib/gentoo/fsarchiver-x.y.z.ebuild 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/distrib/gentoo/fsarchiver-x.y.z.ebuild 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -inherit autotools eutils - -DESCRIPTION="flexible filesystem archiver for backup and deployment tool" -HOMEPAGE="http://www.fsarchiver.org"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="lzo lzma gcrypt static" - -DEPEND="sys-libs/zlib - app-arch/bzip2 - >=sys-fs/e2fsprogs-1.41.4 - >=dev-libs/libgcrypt-1.2.3 - lzma? ( >=app-arch/xz-utils-4.999.9_beta ) - lzo? ( >=dev-libs/lzo-2.02 )" - -src_unpack() { - unpack ${A} - cd "${S}" - eautoconf -} - -src_compile() { - local myconf="--prefix=/usr" - use lzma || myconf="${myconf} --disable-lzma" - use lzo || myconf="${myconf} --disable-lzo" - use static && myconf="${myconf} --enable-static" - econf ${myconf} || die "econf failed." - emake || die "emake failed." -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed." -} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/distrib/rpm/fsarchiver.spec new/fsarchiver-0.6.17/distrib/rpm/fsarchiver.spec --- old/fsarchiver-0.6.16/distrib/rpm/fsarchiver.spec 2013-02-07 19:49:08.000000000 +0100 +++ new/fsarchiver-0.6.17/distrib/rpm/fsarchiver.spec 2013-02-25 20:28:04.000000000 +0100 @@ -1,5 +1,5 @@ Name: fsarchiver -Version: 0.6.12 +Version: 0.6.17 Release: 1%{?dist} Summary: Safe and flexible file-system backup/deployment tool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/doc/fsarchiver.8 new/fsarchiver-0.6.17/doc/fsarchiver.8 --- old/fsarchiver-0.6.16/doc/fsarchiver.8 2013-02-07 19:49:08.000000000 +0100 +++ new/fsarchiver-0.6.17/doc/fsarchiver.8 2013-02-23 16:37:22.000000000 +0100 @@ -34,7 +34,7 @@ .I options .B ] restfs .I archive -.BI id= n ,dest= filesystem [,mkfs= fstype ] +.BI id= n ,dest= filesystem [,mkfs= fstype, mkfsopt= options ] .B ... .PP .B fsarchiver [ @@ -179,6 +179,8 @@ fsarchiver restfs /data/arch2.fsa id=0,dest=/dev/sda1 id=1,dest=/dev/sdb1 .SS restore a filesystem from an archive and convert it to reiserfs: fsarchiver restfs /data/myarchive1.fsa id=0,dest=/dev/sda1,mkfs=reiserfs +.SS restore a filesystem from an archive and specify extra mkfs options: +fsarchiver restfs /data/myarchive1.fsa id=0,dest=/dev/sda1,mkfs=ext4,mkfsopt="-I 256" .SS save the contents of /usr/src/linux to an archive (similar to tar): fsarchiver savedir /data/linux-sources.fsa /usr/src/linux .SS save a /dev/sda1 to an archive split into volumes of 680MB: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/filesys.c new/fsarchiver-0.6.17/src/filesys.c --- old/fsarchiver-0.6.16/src/filesys.c 2013-02-07 19:47:29.000000000 +0100 +++ new/fsarchiver-0.6.17/src/filesys.c 2013-02-23 16:37:18.000000000 +0100 @@ -178,7 +178,7 @@ result=strtok_r(line, delims, &saveptr); major = -1; minor = -1; sep = -1; col_dev[0]=col_mnt[0]=col_fs[0]=col_opt[0]=0; - for(i=0; result != NULL && i<=10; i++) + for(i=0; result != NULL; i++) { if (strcmp(result, "-") == 0) // found separator sep = i; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/filesys.h new/fsarchiver-0.6.17/src/filesys.h --- old/fsarchiver-0.6.16/src/filesys.h 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/filesys.h 2013-02-23 16:37:18.000000000 +0100 @@ -32,7 +32,7 @@ int (*mount)(char *partition, char *mntbuf, char *fsname, int flags, char *mntinfo); int (*umount)(char *partition, char *mntbuf); int (*getinfo)(struct s_dico *d, char *devname); - int (*mkfs)(struct s_dico *d, char *partition); + int (*mkfs)(struct s_dico *d, char *partition, char *fsoptions); int (*test)(char *partition); int (*reqmntopt)(char *partition, struct s_strlist *reqopt, struct s_strlist *badopt); bool winattr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_btrfs.c new/fsarchiver-0.6.17/src/fs_btrfs.c --- old/fsarchiver-0.6.16/src/fs_btrfs.c 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_btrfs.c 2013-02-23 16:37:18.000000000 +0100 @@ -50,7 +50,7 @@ return 0; } -int btrfs_mkfs(cdico *d, char *partition) +int btrfs_mkfs(cdico *d, char *partition, char *fsoptions) { char command[2048]; char buffer[2048]; @@ -85,6 +85,9 @@ // ---- set the advanced filesystem settings from the dico memset(options, 0, sizeof(options)); + + strlcatf(options, sizeof(options), " %s ", fsoptions); + if (dico_get_string(d, 0, FSYSHEADKEY_FSLABEL, buffer, sizeof(buffer))==0 && strlen(buffer)>0) strlcatf(options, sizeof(options), " -L '%s' ", buffer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_btrfs.h new/fsarchiver-0.6.17/src/fs_btrfs.h --- old/fsarchiver-0.6.16/src/fs_btrfs.h 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_btrfs.h 2013-02-23 16:37:18.000000000 +0100 @@ -21,7 +21,7 @@ struct s_dico; struct s_strlist; -int btrfs_mkfs(struct s_dico *d, char *partition); +int btrfs_mkfs(struct s_dico *d, char *partition, char *fsoptions); int btrfs_getinfo(struct s_dico *d, char *devname); int btrfs_mount(char *partition, char *mntbuf, char *fsbuf, int flags, char *mntinfo); int btrfs_umount(char *partition, char *mntbuf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_ext2.c new/fsarchiver-0.6.17/src/fs_ext2.c --- old/fsarchiver-0.6.16/src/fs_ext2.c 2013-02-06 22:50:08.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_ext2.c 2013-02-23 16:37:18.000000000 +0100 @@ -84,19 +84,19 @@ } } -int ext2_mkfs(cdico *d, char *partition) +int ext2_mkfs(cdico *d, char *partition, char *fsoptions) { - return extfs_mkfs(d, partition, EXTFSTYPE_EXT2); + return extfs_mkfs(d, partition, EXTFSTYPE_EXT2, fsoptions); } -int ext3_mkfs(cdico *d, char *partition) +int ext3_mkfs(cdico *d, char *partition, char *fsoptions) { - return extfs_mkfs(d, partition, EXTFSTYPE_EXT3); + return extfs_mkfs(d, partition, EXTFSTYPE_EXT3, fsoptions); } -int ext4_mkfs(cdico *d, char *partition) +int ext4_mkfs(cdico *d, char *partition, char *fsoptions) { - return extfs_mkfs(d, partition, EXTFSTYPE_EXT4); + return extfs_mkfs(d, partition, EXTFSTYPE_EXT4, fsoptions); } int extfs_get_fstype_from_compat_flags(u32 compat, u32 incompat, u32 ro_compat) @@ -137,7 +137,7 @@ return 0; } -int extfs_mkfs(cdico *d, char *partition, int extfstype) +int extfs_mkfs(cdico *d, char *partition, int extfstype, char *fsoptions) { cstrlist strfeatures; u64 features_tab[3]; @@ -178,6 +178,8 @@ // filesystem revision: good-old-rev or dynamic strlcatf(options, sizeof(options), " -r %d ", (int)fsextrevision); + + strlcatf(options, sizeof(options), " %s ", fsoptions); // ---- set the advanced filesystem settings from the dico if (dico_get_string(d, 0, FSYSHEADKEY_FSLABEL, buffer, sizeof(buffer))==0 && strlen(buffer)>0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_ext2.h new/fsarchiver-0.6.17/src/fs_ext2.h --- old/fsarchiver-0.6.16/src/fs_ext2.h 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_ext2.h 2013-02-23 16:37:18.000000000 +0100 @@ -23,13 +23,13 @@ enum {EXTFSTYPE_EXT2, EXTFSTYPE_EXT3, EXTFSTYPE_EXT4}; -int ext2_mkfs(struct s_dico *d, char *partition); -int ext3_mkfs(struct s_dico *d, char *partition); -int ext4_mkfs(struct s_dico *d, char *partition); +int ext2_mkfs(struct s_dico *d, char *partition, char *fsoptions); +int ext3_mkfs(struct s_dico *d, char *partition, char *fsoptions); +int ext4_mkfs(struct s_dico *d, char *partition, char *fsoptions); int extfs_getinfo(struct s_dico *d, char *devname); int extfs_get_fstype_from_compat_flags(u32 compat, u32 incompat, u32 ro_compat); int extfs_get_reqmntopt(char *partition, struct s_strlist *reqopt, struct s_strlist *badopt); -int extfs_mkfs(struct s_dico *d, char *partition, int extfstype); +int extfs_mkfs(struct s_dico *d, char *partition, int extfstype, char *fsoptions); int extfs_mount(char *partition, char *mntbuf, char *fsbuf, int flags, char *mntinfo); int extfs_umount(char *partition, char *mntbuf); int extfs_test(char *partition, int extfstype); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_jfs.c new/fsarchiver-0.6.17/src/fs_jfs.c --- old/fsarchiver-0.6.16/src/fs_jfs.c 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_jfs.c 2013-02-23 16:37:18.000000000 +0100 @@ -35,7 +35,7 @@ #include "strlist.h" #include "error.h" -int jfs_mkfs(cdico *d, char *partition) +int jfs_mkfs(cdico *d, char *partition, char *fsoptions) { char command[2048]; char buffer[2048]; @@ -50,6 +50,9 @@ // ---- set the advanced filesystem settings from the dico memset(options, 0, sizeof(options)); + + strlcatf(options, sizeof(options), " %s ", fsoptions); + if (dico_get_string(d, 0, FSYSHEADKEY_FSLABEL, buffer, sizeof(buffer))==0 && strlen(buffer)>0) strlcatf(options, sizeof(options), " -L '%s' ", buffer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_jfs.h new/fsarchiver-0.6.17/src/fs_jfs.h --- old/fsarchiver-0.6.16/src/fs_jfs.h 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_jfs.h 2013-02-23 16:37:18.000000000 +0100 @@ -21,7 +21,7 @@ struct s_dico; struct s_strlist; -int jfs_mkfs(struct s_dico *d, char *partition); +int jfs_mkfs(struct s_dico *d, char *partition, char *fsoptions); int jfs_getinfo(struct s_dico *d, char *devname); int jfs_mount(char *partition, char *mntbuf, char *fsbuf, int flags, char *mntinfo); int jfs_get_reqmntopt(char *partition, struct s_strlist *reqopt, struct s_strlist *badopt); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_ntfs.c new/fsarchiver-0.6.17/src/fs_ntfs.c --- old/fsarchiver-0.6.16/src/fs_ntfs.c 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_ntfs.c 2013-02-23 16:37:18.000000000 +0100 @@ -34,7 +34,7 @@ #include "strlist.h" #include "error.h" -int ntfs_mkfs(cdico *d, char *partition) +int ntfs_mkfs(cdico *d, char *partition, char *fsoptions) { char command[2048]; char buffer[2048]; @@ -52,6 +52,9 @@ // ---- set the advanced filesystem settings from the dico memset(options, 0, sizeof(options)); + + strlcatf(options, sizeof(options), " %s ", fsoptions); + if (dico_get_string(d, 0, FSYSHEADKEY_FSLABEL, buffer, sizeof(buffer))==0 && strlen(buffer)>0) strlcatf(options, sizeof(options), " --label '%s' ", buffer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_ntfs.h new/fsarchiver-0.6.17/src/fs_ntfs.h --- old/fsarchiver-0.6.16/src/fs_ntfs.h 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_ntfs.h 2013-02-23 16:37:18.000000000 +0100 @@ -33,7 +33,7 @@ u64 uuid; }; -int ntfs_mkfs(struct s_dico *d, char *partition); +int ntfs_mkfs(struct s_dico *d, char *partition, char *fsoptions); int ntfs_getinfo(struct s_dico *d, char *devname); int ntfs_mount(char *partition, char *mntbuf, char *fsbuf, int flags, char *mntinfo); int ntfs_get_reqmntopt(char *partition, struct s_strlist *reqopt, struct s_strlist *badopt); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_reiser4.c new/fsarchiver-0.6.17/src/fs_reiser4.c --- old/fsarchiver-0.6.16/src/fs_reiser4.c 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_reiser4.c 2013-02-23 16:37:18.000000000 +0100 @@ -35,7 +35,7 @@ #include "strlist.h" #include "error.h" -int reiser4_mkfs(cdico *d, char *partition) +int reiser4_mkfs(cdico *d, char *partition, char *fsoptions) { char command[2048]; char buffer[2048]; @@ -51,6 +51,9 @@ // ---- set the advanced filesystem settings from the dico memset(options, 0, sizeof(options)); + + strlcatf(options, sizeof(options), " %s ", fsoptions); + if (dico_get_string(d, 0, FSYSHEADKEY_FSLABEL, buffer, sizeof(buffer))==0 && strlen(buffer)>0) strlcatf(options, sizeof(options), " -L '%.16s' ", buffer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_reiser4.h new/fsarchiver-0.6.17/src/fs_reiser4.h --- old/fsarchiver-0.6.16/src/fs_reiser4.h 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_reiser4.h 2013-02-23 16:37:18.000000000 +0100 @@ -21,7 +21,7 @@ struct s_dico; struct s_strlist; -int reiser4_mkfs(struct s_dico *d, char *partition); +int reiser4_mkfs(struct s_dico *d, char *partition, char *fsoptions); int reiser4_getinfo(struct s_dico *d, char *devname); int reiser4_mount(char *partition, char *mntbuf, char *fsbuf, int flags, char *mntinfo); int reiser4_get_reqmntopt(char *partition, struct s_strlist *reqopt, struct s_strlist *badopt); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_reiserfs.c new/fsarchiver-0.6.17/src/fs_reiserfs.c --- old/fsarchiver-0.6.16/src/fs_reiserfs.c 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_reiserfs.c 2013-02-23 16:37:18.000000000 +0100 @@ -35,7 +35,7 @@ #include "strlist.h" #include "error.h" -int reiserfs_mkfs(cdico *d, char *partition) +int reiserfs_mkfs(cdico *d, char *partition, char *fsoptions) { char command[2048]; char buffer[2048]; @@ -51,6 +51,9 @@ // ---- set the advanced filesystem settings from the dico memset(options, 0, sizeof(options)); + + strlcatf(options, sizeof(options), " %s ", fsoptions); + if (dico_get_string(d, 0, FSYSHEADKEY_FSLABEL, buffer, sizeof(buffer))==0 && strlen(buffer)>0) strlcatf(options, sizeof(options), " -l '%.16s' ", buffer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_reiserfs.h new/fsarchiver-0.6.17/src/fs_reiserfs.h --- old/fsarchiver-0.6.16/src/fs_reiserfs.h 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_reiserfs.h 2013-02-23 16:37:18.000000000 +0100 @@ -21,7 +21,7 @@ struct s_dico; struct s_strlist; -int reiserfs_mkfs(struct s_dico *d, char *partition); +int reiserfs_mkfs(struct s_dico *d, char *partition, char *fsoptions); int reiserfs_getinfo(struct s_dico *d, char *devname); int reiserfs_mount(char *partition, char *mntbuf, char *fsbuf, int flags, char *mntinfo); int reiserfs_get_reqmntopt(char *partition, struct s_strlist *reqopt, struct s_strlist *badopt); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_xfs.c new/fsarchiver-0.6.17/src/fs_xfs.c --- old/fsarchiver-0.6.16/src/fs_xfs.c 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_xfs.c 2013-02-23 16:37:18.000000000 +0100 @@ -34,7 +34,7 @@ #include "strlist.h" #include "error.h" -int xfs_mkfs(cdico *d, char *partition) +int xfs_mkfs(cdico *d, char *partition, char *fsoptions) { char command[2048]; char buffer[2048]; @@ -48,6 +48,9 @@ } memset(options, 0, sizeof(options)); + + strlcatf(options, sizeof(options), " %s ", fsoptions); + if (dico_get_string(d, 0, FSYSHEADKEY_FSLABEL, buffer, sizeof(buffer))==0 && strlen(buffer)>0) strlcatf(options, sizeof(options), " -L '%.12s' ", buffer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/fs_xfs.h new/fsarchiver-0.6.17/src/fs_xfs.h --- old/fsarchiver-0.6.16/src/fs_xfs.h 2013-02-06 22:38:54.000000000 +0100 +++ new/fsarchiver-0.6.17/src/fs_xfs.h 2013-02-23 16:37:18.000000000 +0100 @@ -23,7 +23,7 @@ #define XFS_SUPER_MAGIC 0x58465342 -int xfs_mkfs(struct s_dico *d, char *partition); +int xfs_mkfs(struct s_dico *d, char *partition, char *fsoptions); int xfs_getinfo(struct s_dico *d, char *devname); int xfs_mount(char *partition, char *mntbuf, char *fsbuf, int flags, char *mntinfo); int xfs_get_reqmntopt(char *partition, struct s_strlist *reqopt, struct s_strlist *badopt); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fsarchiver-0.6.16/src/oper_restore.c new/fsarchiver-0.6.17/src/oper_restore.c --- old/fsarchiver-0.6.16/src/oper_restore.c 2013-02-07 19:49:08.000000000 +0100 +++ new/fsarchiver-0.6.17/src/oper_restore.c 2013-02-23 16:37:22.000000000 +0100 @@ -121,7 +121,7 @@ return -1; // parse argument and write (key,value) pairs in the strdico object - if ((strdico_set_valid_keys(tmpdico, "id,dest,mkfs")!=0) || + if ((strdico_set_valid_keys(tmpdico, "id,dest,mkfs,mkfsopt")!=0) || (strdico_parse_string(tmpdico, cmdargv[i])!=0)) { strdico_destroy(tmpdico); return -1; @@ -1177,6 +1177,7 @@ char magic[FSA_SIZEOF_MAGIC+1]; char mountinfo[4096]; char partition[1024]; + char mkfsoptions[1024]; char tempbuf[1024]; cdico *dicobegin=NULL; cdico *dicoend=NULL; @@ -1246,6 +1247,12 @@ { errprintf("dico_get_string(FSYSHEADKEY_FILESYSTEM) failed\n"); return -1; } + + // read make file system options from dicocmdline + if (strdico_get_string(dicocmdline, mkfsoptions, sizeof(mkfsoptions), "mkfsopt")!=0) + { + msgprintf(MSG_VERB2,"strdico_get_string(dicocmdline, 'mkfsopt') doesn't exist\n"); + } if (dico_get_u64(dicofs, 0, FSYSHEADKEY_BYTESTOTAL, &fsbytestotal)!=0) { errprintf("dico_get_string(FSYSHEADKEY_BYTESTOTAL) failed\n"); @@ -1258,6 +1265,7 @@ } msgprintf(MSG_VERB2, "filesystem=[%s]\n", filesystem); + msgprintf(MSG_VERB2, "filesystemoptions=[%s]\n", mkfsoptions); msgprintf(MSG_VERB2, "fsbytestotal=[%s]\n", format_size(fsbytestotal, text, sizeof(text), 'h')); msgprintf(MSG_VERB2, "fsbytesused=[%s]\n", format_size(fsbytesused, text, sizeof(text), 'h')); @@ -1268,11 +1276,11 @@ } // ---- make the filesystem - if (filesys[fstype].mkfs(dicofs, partition)!=0) + if (filesys[fstype].mkfs(dicofs, partition, mkfsoptions)!=0) { errprintf("cannot format the filesystem %s on partition %s\n", filesystem, partition); return -1; } - + // ---- mount the new filesystem mkdir_recursive(mntbuf); generate_random_tmpdir(mntbuf, sizeof(mntbuf), 0); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
