e2scrub: add the -n option which shows what commands e2scrub would execute

Also fix the copyright symbol so it is properly formatted when
processed into postscript or pdf.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/scrub/e2scrub.8.in b/scrub/e2scrub.8.in
index ff03523e39a91d152241a5f38c5a17e153d5045e..d0c8b2528c54a25d09ac8c424f96a0d696fca782 100644 (file)
--- a/scrub/e2scrub.8.in
+++ b/scrub/e2scrub.8.in
@@ -38,6 +38,15 @@ If the filesystem is not repaired,
 will be run before the next mount.
 .SH OPTIONS
 .TP
+\fB-n\fR
+Print what commands
+.B e2scrub
+would execute to check the file system.  (Note: the commands will not
+actually be executed; however, since
+.B e2scrub
+needs to run some commands to query the system to determine what
+commands would be executed, it still needs to be run as root.)
+.TP
 \fB-r\fR
 Remove the e2scrub snapshot and exit without checking anything.
 .TP
@@ -57,4 +66,4 @@ The exit codes are the same as in
 .SH AUTHOR
 Darrick J. Wong <darrick.wong@oracle.com>
 .SH COPYRIGHT
-Copyright ©2018 Oracle.  License is GPLv2+. <http://www.gnu.org/licenses/gpl-2.0.html>
+Copyright \[co]2018 Oracle.  License is GPLv2+. <http://www.gnu.org/licenses/gpl-2.0.html>

diff --git a/scrub/e2scrub.in b/scrub/e2scrub.in
index 51a909373be4435e623fbfb0a2633e82cf3c9b98..301574968f2c99f9608a0e3006b2ba3067ac3230 100644 (file)
--- a/scrub/e2scrub.in
+++ b/scrub/e2scrub.in
@@ -37,6 +37,7 @@ print_help() {
        echo "Usage: $0 [OPTIONS] mountpoint | device"
        echo
        echo "mountpoint must be on a LVM-managed block device"
+       echo "-n: Show what commands e2scrub would execute."
        echo "-r: Remove e2scrub snapshot and exit, do not check anything."
        echo "-t: Run fstrim if successful."
        echo "-V: Print version information and exit."
@@ -68,8 +69,9 @@ exitcode() {
        exit "${ret}"
 }
 
-while getopts "rtV" opt; do
-       case "${opt}" in
+while getopts "nrtV" opt; do
+    case "${opt}" in
+       "n") DBG="echo Would execute: " ;;
        "r") reap=1;;
        "t") fstrim=1;;
        "V") print_version; exitcode 0;;