[patch] reiser4progs-add_preen-to-fsck.patch

reiser4progs-add_preen-to-fsck.patch (text/plain), 3.85 KB, created by Matt on 2008-01-18 17:17:50 UTC

diff -Nrcpad reiser4progs-1.0.6/doc/fsck.reiser4.8 reiser4progs-1.0.6_gentoo/doc/fsck.reiser4.8
*** reiser4progs-1.0.6/doc/fsck.reiser4.8	2006-11-01 15:50:34.000000000 +0100
--- reiser4progs-1.0.6_gentoo/doc/fsck.reiser4.8	2008-01-18 16:14:40.241416630 +0100
*************** supresses gauges.
*** 54,60 ****
  ignored.
  .SH PLUGIN OPTIONS
  .TP
! .B -p, --print-profile
  prints the plugin profile. This is the set of default plugins used for all
  parts of a filesystem -- format, nodes, files, directories, hashes, etc. If
  --override is specified, then prints modified plugins.
--- 54,60 ----
  ignored.
  .SH PLUGIN OPTIONS
  .TP
! .B --print-profile
  prints the plugin profile. This is the set of default plugins used for all
  parts of a filesystem -- format, nodes, files, directories, hashes, etc. If
  --override is specified, then prints modified plugins.
*************** assumes an answer 'yes' to all questions
*** 82,87 ****
--- 82,90 ----
  .B -f, --force
  forces fsck to use whole disk, not block device or mounted partition.
  .TP
+ .B -p, --preen
+ automatically repair minor corruptions on the filesystem.
+ .TP
  .B -c, --cache N
  tunes number of nodes in the libreiser4 tree buffer cache
  .RS
diff -Nrcpad reiser4progs-1.0.6/progs/fsck/fsck.c reiser4progs-1.0.6_gentoo/progs/fsck/fsck.c
*** reiser4progs-1.0.6/progs/fsck/fsck.c	2006-11-01 15:50:34.000000000 +0100
--- reiser4progs-1.0.6_gentoo/progs/fsck/fsck.c	2008-01-18 16:20:31.723917114 +0100
*************** static void fsck_print_usage(char *name)
*** 28,34 ****
  		"  -q, --quiet                   supresses gauges\n"
  		"  -r                            ignored\n"
  		"Plugins options:\n"
! 		"  -p, --print-profile           prints the plugin profile.\n"
  		"  -l, --print-plugins           prints all known plugins.\n"
  		"  -o, --override TYPE=PLUGIN    overrides the default plugin of the type\n"
  	        "                                \"TYPE\" by the plugin \"PLUGIN\" in the\n"
--- 28,34 ----
  		"  -q, --quiet                   supresses gauges\n"
  		"  -r                            ignored\n"
  		"Plugins options:\n"
! 		"  --print-profile	         prints the plugin profile.\n"
  		"  -l, --print-plugins           prints all known plugins.\n"
  		"  -o, --override TYPE=PLUGIN    overrides the default plugin of the type\n"
  	        "                                \"TYPE\" by the plugin \"PLUGIN\" in the\n"
*************** static void fsck_print_usage(char *name)
*** 39,44 ****
--- 39,45 ----
  		"  -y, --yes                     assumes an answer 'yes' to all questions.\n"
  		"  -f, --force                   makes fsck to use whole disk, not block\n"
  		"                                device or mounted partition.\n"
+ 		"  -p, --preen                   automatically repair the filesysem.\n"		
  		"  -c, --cache N                 number of nodes in tree buffer cache\n");
  }
  
*************** static errno_t fsck_init(fsck_parse_t *d
*** 140,145 ****
--- 141,147 ----
  		{"no-log", no_argument, NULL, 'n'},
  		{"auto", no_argument, NULL, 'a'},
  		{"force", no_argument, NULL, 'f'},
+ 		{"preen", no_argument, NULL, 'p'},		
  		{"cache", required_argument, 0, 'c'},
  		{"override", required_argument, NULL, 'o'},
  		/* Fsck hidden options. */
*************** static errno_t fsck_init(fsck_parse_t *d
*** 203,208 ****
--- 205,214 ----
  		case 'q':
  			aux_gauge_set_handler(NULL, GT_PROGRESS);
  			break;
+ 		case 'p':
+ 			/* this should fix baselayout-2/openrc problems */
+ 			aal_set_bit(&data->options, FSCK_OPT_AUTO);
+ 			break;			
  		case 'y':
  			aal_set_bit(&data->options, FSCK_OPT_YES);
  			break;
*************** static errno_t fsck_init(fsck_parse_t *d
*** 226,234 ****
  		case 'l':
  			mode = RM_SHOW_PLUG;
  			break;
- 		case 'p':
- 			mode = RM_SHOW_PARM;
- 			break;
  		case 'o':
  			aal_strncat(override, optarg, aal_strlen(optarg));
  			aal_strncat(override, ",", 1);
--- 232,237 ----