mirror of
https://github.com/amadvance/snapraid.git
synced 2026-10-26 02:49:02 -04:00
Renames -s and -t to -S and -B.
We need some free space in option names and these ones are anyway intended to be manual ones.
This commit is contained in:
Andrea Mazzoleni
parent
c6c9e9130e
commit
5cc16bd4ad
6 changed files with 21 additions and 19 deletions
2
HISTORY
2
HISTORY
|
|
@ -5,6 +5,8 @@ SnapRAID HISTORY
|
|||
================
|
||||
* The -e, --filter-error option now is more efficient and triggers
|
||||
a lot less data to be read.
|
||||
* Renamed the -s and -t options to -S and -B as they are intended to
|
||||
be manual only operations.
|
||||
|
||||
7.1 2015/01
|
||||
===========
|
||||
|
|
|
|||
10
Makefile.am
10
Makefile.am
|
|
@ -509,19 +509,19 @@ endif
|
|||
rm bench/disk2/a/5*
|
||||
rm bench/disk3/a/6*
|
||||
rm bench/disk4/a/6*
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) -t 10 sync --test-force-content-text
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) -B 10 sync --test-force-content-text
|
||||
cp bench/content bench/content.txt
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS_VERBOSE) -c $(CONF) test-rewrite
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS_VERBOSE) -c $(CONF) --test-force-content-text test-rewrite
|
||||
cmp bench/content bench/content.txt
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) check -l test.log
|
||||
$(TESTENV) ./mktest$(EXEEXT) generate 4 6 $(CHECKCOUNT) $(CHECKSIZE)
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) -t 100 sync --test-force-content-text
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) -B 100 sync --test-force-content-text
|
||||
cp bench/content bench/content.txt
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) test-rewrite
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) --test-force-content-text test-rewrite
|
||||
cmp bench/content bench/content.txt
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) -t 1000 sync
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) -B 1000 sync
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) check -l test.log
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) sync
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) check
|
||||
|
|
@ -562,7 +562,7 @@ endif
|
|||
echo --- Abort sync early with additions, delete them and recover with PAR2
|
||||
echo --- This triggers the recovering with q using p to check the validity, but failing for new block being filled with zero
|
||||
cp -pR bench/disk1/a bench/disk1/a_copy
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -t 1 --test-kill-after-sync -c $(CONF) sync
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -B 1 --test-kill-after-sync -c $(CONF) sync
|
||||
rm -r bench/disk1/a_copy
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) --test-expect-unrecoverable -c $(PAR2) fix -l test-fail-earlysyncadd.log
|
||||
rm -r bench/disk1/a_copy
|
||||
|
|
@ -618,7 +618,7 @@ endif
|
|||
cp -pR bench/disk1/a bench/disk1/a_copy
|
||||
mv bench/disk1/a bench/a
|
||||
mv bench/disk1/b bench/b
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) -t 1 --test-kill-after-sync sync
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) -c $(CONF) -B 1 --test-kill-after-sync sync
|
||||
rm -r bench/disk2
|
||||
mkdir bench/disk2
|
||||
$(TESTENV) ./snapraid$(EXEEXT) $(CHECKFLAGS) --test-expect-unrecoverable -c $(PAR1) fix -l test-fail-earlysyncdel.log
|
||||
|
|
|
|||
|
|
@ -249,8 +249,8 @@ struct option long_options[] = {
|
|||
{ "filter-error", 0, 0, 'e' },
|
||||
{ "percentage", 1, 0, 'p' },
|
||||
{ "older-than", 1, 0, 'o' },
|
||||
{ "start", 1, 0, 's' },
|
||||
{ "count", 1, 0, 't' },
|
||||
{ "start", 1, 0, 'S' },
|
||||
{ "count", 1, 0, 'B' },
|
||||
{ "import", 1, 0, 'i' },
|
||||
{ "log", 1, 0, 'l' },
|
||||
{ "force-zero", 0, 0, 'Z' },
|
||||
|
|
@ -353,7 +353,7 @@ struct option long_options[] = {
|
|||
};
|
||||
#endif
|
||||
|
||||
#define OPTIONS "c:f:d:mep:o:s:t:i:l:ZEUDNFahTC:vqHVG"
|
||||
#define OPTIONS "c:f:d:mep:o:S:B:i:l:ZEUDNFahTC:vqHVG"
|
||||
|
||||
volatile int global_interrupt = 0;
|
||||
|
||||
|
|
@ -492,7 +492,7 @@ int main(int argc, char* argv[])
|
|||
/* LCOV_EXCL_STOP */
|
||||
}
|
||||
break;
|
||||
case 's' :
|
||||
case 'S' :
|
||||
blockstart = strtoul(optarg, &e, 0);
|
||||
if (!e || *e) {
|
||||
/* LCOV_EXCL_START */
|
||||
|
|
@ -501,7 +501,7 @@ int main(int argc, char* argv[])
|
|||
/* LCOV_EXCL_STOP */
|
||||
}
|
||||
break;
|
||||
case 't' :
|
||||
case 'B' :
|
||||
blockcount = strtoul(optarg, &e, 0);
|
||||
if (!e || *e) {
|
||||
/* LCOV_EXCL_START */
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ snapraid [\-c, \-\-conf CONFIG]
|
|||
.PD 0
|
||||
.PP
|
||||
.PD
|
||||
[\-s, \-\-start BLKSTART] [\-t, \-\-count BLKCOUNT]
|
||||
[\-S, \-\-start BLKSTART] [\-T, \-\-count BLKCOUNT]
|
||||
.PD 0
|
||||
.PP
|
||||
.PD
|
||||
|
|
@ -871,13 +871,13 @@ to enclose the name in \[dq], like \[dq]>>result.log\[dq].
|
|||
To output the log to standard output or standard error,
|
||||
you can use respectively \[dq]>&1\[dq] and \[dq]>&2\[dq].
|
||||
.TP
|
||||
.B \-s, \-\-start BLKSTART
|
||||
.B \-S, \-\-start BLKSTART
|
||||
Starts the processing from the specified
|
||||
block number. It could be useful to retry to check
|
||||
or fix some specific block, in case of a damaged disk.
|
||||
It\'s present mainly for advanced manual recovering.
|
||||
.TP
|
||||
.B \-t, \-\-count BLKCOUNT
|
||||
.B \-T, \-\-count BLKCOUNT
|
||||
Processes only the specified number of blocks.
|
||||
It\'s present mainly for advanced manual recovering.
|
||||
.TP
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ Synopsis
|
|||
: [-U, --force-uuid] [-D, --force-device]
|
||||
: [-N, --force-nocopy] [-F, --force-full]
|
||||
: [-v, --verbose] [-l, --log FILE]
|
||||
: [-s, --start BLKSTART] [-t, --count BLKCOUNT]
|
||||
: [-S, --start BLKSTART] [-T, --count BLKCOUNT]
|
||||
: status|sync|scrub|fix|check|list|diff|dup|pool|rehash
|
||||
|
||||
:snapraid [-V, --version] [-H, --help] [-C, --gen-conf CONTENT]
|
||||
|
|
@ -634,13 +634,13 @@ Options
|
|||
To output the log to standard output or standard error,
|
||||
you can use respectively ">&1" and ">&2".
|
||||
|
||||
-s, --start BLKSTART
|
||||
-S, --start BLKSTART
|
||||
Starts the processing from the specified
|
||||
block number. It could be useful to retry to check
|
||||
or fix some specific block, in case of a damaged disk.
|
||||
It's present mainly for advanced manual recovering.
|
||||
|
||||
-t, --count BLKCOUNT
|
||||
-T, --count BLKCOUNT
|
||||
Processes only the specified number of blocks.
|
||||
It's present mainly for advanced manual recovering.
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ snapraid [-c, --conf CONFIG]
|
|||
[-U, --force-uuid] [-D, --force-device]
|
||||
[-N, --force-nocopy] [-F, --force-full]
|
||||
[-v, --verbose] [-l, --log FILE]
|
||||
[-s, --start BLKSTART] [-t, --count BLKCOUNT]
|
||||
[-S, --start BLKSTART] [-T, --count BLKCOUNT]
|
||||
status|sync|scrub|fix|check|list|diff|dup|pool|rehash
|
||||
|
||||
snapraid [-V, --version] [-H, --help] [-C, --gen-conf CONTENT]
|
||||
|
|
@ -679,13 +679,13 @@ SnapRAID provides the following options:
|
|||
To output the log to standard output or standard error,
|
||||
you can use respectively ">&1" and ">&2".
|
||||
|
||||
-s, --start BLKSTART
|
||||
-S, --start BLKSTART
|
||||
Starts the processing from the specified
|
||||
block number. It could be useful to retry to check
|
||||
or fix some specific block, in case of a damaged disk.
|
||||
It's present mainly for advanced manual recovering.
|
||||
|
||||
-t, --count BLKCOUNT
|
||||
-T, --count BLKCOUNT
|
||||
Processes only the specified number of blocks.
|
||||
It's present mainly for advanced manual recovering.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue