| 1 |
vapier 08/05/31 17:48:55 |
| 2 |
|
| 3 |
Added: reiser4progs-1.0.6-preen.patch |
| 4 |
Log: |
| 5 |
Change the meaning of -p to --preen #195988 by Radu Benea and Roy Marples. |
| 6 |
(Portage version: 2.2_pre5.spank.spunk) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/reiser4progs/files/reiser4progs-1.0.6-preen.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: reiser4progs-1.0.6-preen.patch |
| 15 |
=================================================================== |
| 16 |
make -p mean "preen" like all other checkers |
| 17 |
|
| 18 |
http://bugs.gentoo.org/195988 |
| 19 |
|
| 20 |
--- a/doc/fsck.reiser4.8 |
| 21 |
+++ b/doc/fsck.reiser4.8 |
| 22 |
@@ -54,7 +54,7 @@ |
| 23 |
ignored. |
| 24 |
.SH PLUGIN OPTIONS |
| 25 |
.TP |
| 26 |
-.B -p, --print-profile |
| 27 |
+.B --print-profile |
| 28 |
prints the plugin profile. This is the set of default plugins used for all |
| 29 |
parts of a filesystem -- format, nodes, files, directories, hashes, etc. If |
| 30 |
--override is specified, then prints modified plugins. |
| 31 |
@@ -82,6 +82,9 @@ |
| 32 |
.B -f, --force |
| 33 |
forces fsck to use whole disk, not block device or mounted partition. |
| 34 |
.TP |
| 35 |
+.B -p, --preen |
| 36 |
+automatically repair minor corruptions on the filesystem. |
| 37 |
+.TP |
| 38 |
.B -c, --cache N |
| 39 |
tunes number of nodes in the libreiser4 tree buffer cache |
| 40 |
.RS |
| 41 |
--- a/progs/fsck/fsck.c |
| 42 |
+++ b/progs/fsck/fsck.c |
| 43 |
@@ -28,7 +28,7 @@ |
| 44 |
" -q, --quiet supresses gauges\n" |
| 45 |
" -r ignored\n" |
| 46 |
"Plugins options:\n" |
| 47 |
- " -p, --print-profile prints the plugin profile.\n" |
| 48 |
+ " --print-profile prints the plugin profile.\n" |
| 49 |
" -l, --print-plugins prints all known plugins.\n" |
| 50 |
" -o, --override TYPE=PLUGIN overrides the default plugin of the type\n" |
| 51 |
" \"TYPE\" by the plugin \"PLUGIN\" in the\n" |
| 52 |
@@ -39,6 +39,7 @@ |
| 53 |
" -y, --yes assumes an answer 'yes' to all questions.\n" |
| 54 |
" -f, --force makes fsck to use whole disk, not block\n" |
| 55 |
" device or mounted partition.\n" |
| 56 |
+ " -p, --preen automatically repair the filesysem.\n" |
| 57 |
" -c, --cache N number of nodes in tree buffer cache\n"); |
| 58 |
} |
| 59 |
|
| 60 |
@@ -140,6 +141,7 @@ |
| 61 |
{"no-log", no_argument, NULL, 'n'}, |
| 62 |
{"auto", no_argument, NULL, 'a'}, |
| 63 |
{"force", no_argument, NULL, 'f'}, |
| 64 |
+ {"preen", no_argument, NULL, 'p'}, |
| 65 |
{"cache", required_argument, 0, 'c'}, |
| 66 |
{"override", required_argument, NULL, 'o'}, |
| 67 |
/* Fsck hidden options. */ |
| 68 |
@@ -203,6 +205,9 @@ |
| 69 |
case 'q': |
| 70 |
aux_gauge_set_handler(NULL, GT_PROGRESS); |
| 71 |
break; |
| 72 |
+ case 'p': |
| 73 |
+ /* Fall through as preen should fix errors */ |
| 74 |
+ mode = RM_FIX; |
| 75 |
case 'y': |
| 76 |
aal_set_bit(&data->options, FSCK_OPT_YES); |
| 77 |
break; |
| 78 |
@@ -226,9 +231,6 @@ |
| 79 |
case 'l': |
| 80 |
mode = RM_SHOW_PLUG; |
| 81 |
break; |
| 82 |
- case 'p': |
| 83 |
- mode = RM_SHOW_PARM; |
| 84 |
- break; |
| 85 |
case 'o': |
| 86 |
aal_strncat(override, optarg, aal_strlen(optarg)); |
| 87 |
aal_strncat(override, ",", 1); |
| 88 |
|
| 89 |
|
| 90 |
|
| 91 |
-- |
| 92 |
gentoo-commits@l.g.o mailing list |
Archives