net-im/emesene/files/sys-fs/reiser4progs/files/reiser4progs-add_preen-to-fsck.patch

   1 diff -Nrcpad reiser4progs-1.0.6/doc/fsck.reiser4.8 reiser4progs-1.0.6_gentoo/doc/fsck.reiser4.8
   2 *** reiser4progs-1.0.6/doc/fsck.reiser4.8       2006-11-01 15:50:34.000000000 +0100
   3 --- reiser4progs-1.0.6_gentoo/doc/fsck.reiser4.8        2008-01-18 16:14:40.241416630 +0100
   4 *************** supresses gauges.
   5 *** 54,60 ****
   6   ignored.
   7   .SH PLUGIN OPTIONS
   8   .TP
   9 ! .B -p, --print-profile
  10   prints the plugin profile. This is the set of default plugins used for all
  11   parts of a filesystem -- format, nodes, files, directories, hashes, etc. If
  12   --override is specified, then prints modified plugins.
  13 --- 54,60 ----
  14   ignored.
  15   .SH PLUGIN OPTIONS
  16   .TP
  17 ! .B --print-profile
  18   prints the plugin profile. This is the set of default plugins used for all
  19   parts of a filesystem -- format, nodes, files, directories, hashes, etc. If
  20   --override is specified, then prints modified plugins.
  21 *************** assumes an answer 'yes' to all questions
  22 *** 82,87 ****
  23 --- 82,90 ----
  24   .B -f, --force
  25   forces fsck to use whole disk, not block device or mounted partition.
  26   .TP
  27 + .B -p, --preen
  28 + automatically repair minor corruptions on the filesystem.
  29 + .TP
  30   .B -c, --cache N
  31   tunes number of nodes in the libreiser4 tree buffer cache
  32   .RS
  33 diff -Nrcpad reiser4progs-1.0.6/progs/fsck/fsck.c reiser4progs-1.0.6_gentoo/progs/fsck/fsck.c
  34 *** reiser4progs-1.0.6/progs/fsck/fsck.c        2006-11-01 15:50:34.000000000 +0100
  35 --- reiser4progs-1.0.6_gentoo/progs/fsck/fsck.c 2008-01-18 16:20:31.723917114 +0100
  36 *************** static void fsck_print_usage(char *name)
  37 *** 28,34 ****
  38                 "  -q, --quiet                   supresses gauges\n"
  39                 "  -r                            ignored\n"
  40                 "Plugins options:\n"
  41 !               "  -p, --print-profile           prints the plugin profile.\n"
  42                 "  -l, --print-plugins           prints all known plugins.\n"
  43                 "  -o, --override TYPE=PLUGIN    overrides the default plugin of the type\n"
  44                 "                                \"TYPE\" by the plugin \"PLUGIN\" in the\n"
  45 --- 28,34 ----
  46                 "  -q, --quiet                   supresses gauges\n"
  47                 "  -r                            ignored\n"
  48                 "Plugins options:\n"
  49 !               "  --print-profile               prints the plugin profile.\n"
  50                 "  -l, --print-plugins           prints all known plugins.\n"
  51                 "  -o, --override TYPE=PLUGIN    overrides the default plugin of the type\n"
  52                 "                                \"TYPE\" by the plugin \"PLUGIN\" in the\n"
  53 *************** static void fsck_print_usage(char *name)
  54 *** 39,44 ****
  55 --- 39,45 ----
  56                 "  -y, --yes                     assumes an answer 'yes' to all questions.\n"
  57                 "  -f, --force                   makes fsck to use whole disk, not block\n"
  58                 "                                device or mounted partition.\n"
  59 +               "  -p, --preen                   automatically repair the filesysem.\n"
  60                 "  -c, --cache N                 number of nodes in tree buffer cache\n");
  61   }
  62
  63 *************** static errno_t fsck_init(fsck_parse_t *d
  64 *** 140,145 ****
  65 --- 141,147 ----
  66                 {"no-log", no_argument, NULL, 'n'},
  67                 {"auto", no_argument, NULL, 'a'},
  68                 {"force", no_argument, NULL, 'f'},
  69 +               {"preen", no_argument, NULL, 'p'},
  70                 {"cache", required_argument, 0, 'c'},
  71                 {"override", required_argument, NULL, 'o'},
  72                 /* Fsck hidden options. */
  73 *************** static errno_t fsck_init(fsck_parse_t *d
  74 *** 203,208 ****
  75 --- 205,214 ----
  76                 case 'q':
  77                         aux_gauge_set_handler(NULL, GT_PROGRESS);
  78                         break;
  79 +               case 'p':
  80 +                       /* this should fix baselayout-2/openrc problems */
  81 +                       aal_set_bit(&data->options, FSCK_OPT_AUTO);
  82 +                       break;
  83                 case 'y':
  84                         aal_set_bit(&data->options, FSCK_OPT_YES);
  85                         break;
  86 *************** static errno_t fsck_init(fsck_parse_t *d
  87 *** 226,234 ****
  88                 case 'l':
  89                         mode = RM_SHOW_PLUG;
  90                         break;
  91 -               case 'p':
  92 -                       mode = RM_SHOW_PARM;
  93 -                       break;
  94                 case 'o':
  95                         aal_strncat(override, optarg, aal_strlen(optarg));
  96                         aal_strncat(override, ",", 1);
  97 --- 232,237 ----
  98