From: Arvin Schnell <aschnell@suse.de>
Date: Thu, 4 Aug 2011 19:18:15 +0000 (+0200)
Subject: - minor adjustment for experimental ext4 support
X-Git-Tag: v0.1.3~314
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=696c1acb5b5e640b79997b31e73dbdf7a5b3c3ab;p=thirdparty%2Fsnapper.git

- minor adjustment for experimental ext4 support
---

diff --git a/doc/snapper.8.in b/doc/snapper.8.in
index 85c84a50..cf5f4e3e 100644
--- a/doc/snapper.8.in
+++ b/doc/snapper.8.in
@@ -1,7 +1,7 @@
 .TH "snapper" "8" @VERSION@ "snapper" "System Tools"
 .SH "NAME"
 .LP
-snapper - Command\-line program for btrfs snapshot management
+snapper - Command\-line program for filesystem snapshot management
 
 .SH "SYNTAX"
 .LP
@@ -12,16 +12,17 @@ snapper \fBhelp\fR
 
 .SH "DESCRIPTION"
 .LP
-Snapper is a command\-line program for btrfs snapshot management. It can
-create, delete and compare snapshots and rollback changes between snapshots.
+Snapper is a command\-line program for filesystem snapshot management. It can
+create, delete and compare snapshots and rollback changes between
+snapshots. Supported filesystems are btrfs and ext4.
 
 .SH CONCEPTS
 
 .SS Configurations
 .LP
-For each btrfs subvolume that should be snapshotted by snapper a configuration
-file is required. The complete setup can be done with the create-config
-command.
+For each filesystem or subvolume that should be snapshotted by snapper a
+configuration file is required. The complete setup can be done with the
+create-config command.
 
 .SS Snapshots
 .LP
@@ -36,7 +37,7 @@ filesystem before and after a modification.
 \fBsingle\fR - These snapshots have no special relationship to other
 snapshots.
 .LP
-Note that btrfs\-wise all three types are the same.
+Note that filesystem\-wise all three types are the same.
 
 .SS Automatic Snapshot Creation
 Next to manual snapshot creation snapshots are also created automatically.
@@ -70,7 +71,7 @@ Suppress normal output. Error messages will still be printed, though.
 Increase verbosity.
 .TP
 .I \-t, \-\-table\-style
-Specifies table style to use. Table style is identified by an integer number.
+Specifies table style. Table style is identified by an integer number.
 .TP
 .I \-c, \-\-config <name>
 Use specified configuration instead of the default.
@@ -100,7 +101,11 @@ List available configurations.
 
 .TP
 .B create-config [options] <subvolume>
-Create a new configuration for a btrfs subvolume.
+Create a new configuration for a filesystem or subvolume.
+.TP
+\fI\-f, \-\-fstype\fR <fstype>
+Manually set filesystem type. Supported values are btrfs and ext4. Without
+this option snapper detect the filesystem.
 .TP
 \fI\-t, \-\-template\fR <name>
 Name of template for the new configuration file.
@@ -142,6 +147,14 @@ New description for snapshot.
 .B delete <number>
 Delete a snapshot.
 
+.TP
+.B mount <number>
+Mount a snapshot. Not required for all filesystem types.
+
+.TP
+.B umount <number>
+Unmount a snapshot. Not required for all filesystem types.
+
 .TP
 .B diff [options] <number1> <number2>
 Compare two snapshots. This will show a list of files and directories
diff --git a/package/snapper.changes b/package/snapper.changes
index 5f1fa328..03b48191 100644
--- a/package/snapper.changes
+++ b/package/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Aug 04 20:51:59 CEST 2011 - aschnell@suse.de
+
+- added experimental ext4 support
+
 -------------------------------------------------------------------
 Mon Aug 01 14:42:16 CEST 2011 - aschnell@suse.de
 
diff --git a/snapper.spec.in b/snapper.spec.in
index 4eaff5f0..c26f9b92 100644
--- a/snapper.spec.in
+++ b/snapper.spec.in
@@ -61,8 +61,9 @@ rm -rf "$RPM_BUILD_ROOT"
 %package -n libsnapper@LIBVERSION_MAJOR@
 Summary:	Library for filesystem snapshot management
 Group:		System/Libraries
-Requires:	btrfsprogs diffutils util-linux
+Requires:	diffutils util-linux
 PreReq:		%fillup_prereq
+Supplements:	btrfsprogs e2fsprogs
 
 %description -n libsnapper@LIBVERSION_MAJOR@
 This package contains libsnapper, a library for filesystem snapshot management.
diff --git a/tools/snapper.cc b/tools/snapper.cc
index 17ec6740..0ea6b531 100644
--- a/tools/snapper.cc
+++ b/tools/snapper.cc
@@ -110,6 +110,7 @@ help_create_config()
 	 << _("\tsnapper create-config <subvolume>") << endl
 	 << endl
 	 << _("    Options for 'create-config' command:") << endl
+	 << _("\t--fstype, -f <fstype>\t\tManually set filesystem type.") << endl
 	 << _("\t--template, -t <name>\t\tName of config template to use.") << endl
 	 << endl;
 }
@@ -785,8 +786,8 @@ command_help()
     help_create();
     help_modify();
     help_delete();
-    // help_mount();	// secret until ext4 finished
-    // help_umount();	// secret until ext4 finished
+    help_mount();
+    help_umount();
     help_diff();
     help_rollback();
     help_cleanup();