"Julian H. Stacey" <j...@berklix.com> wrote in <201310230254.r9n2sld1067...@fire.js.berklix.net>:
jh> Regresssion in 10.0-BETA1, mdconfig -l -v return code changed from 0 jh> to 255. OK, its not specfied in manual, but has changed. jh> A test script I was using caught it: jh> http://www.berklix.com/~jhs/bin/sh/mdconfig_tst jh> Probably in next day or 2 I'll hack the C & send-pr. Does the attached patch fix it? -- Hiroki
Index: sbin/mdconfig/mdconfig.c
===================================================================
--- sbin/mdconfig/mdconfig.c (revision 256952)
+++ sbin/mdconfig/mdconfig.c (working copy)
@@ -481,12 +481,18 @@
printf("\n");
/* XXX: Check if it's enough to clean everything. */
geom_stats_snapshot_free(sq);
- if (((opt & OPT_UNIT) && (fflag == NULL) && ufound) ||
- ((opt & OPT_UNIT) == 0 && (fflag != NULL) && ffound) ||
- ((opt & OPT_UNIT) && (fflag != NULL) && ufound && ffound))
- return (0);
- else
- return (-1);
+ if (opt & OPT_UNIT) {
+ if (((fflag == NULL) && ufound) ||
+ ((fflag == NULL) && (units != NULL) && ufound) ||
+ ((fflag != NULL) && ffound) ||
+ ((fflag != NULL) && (units != NULL) && ufound && ffound))
+ return (0);
+ } else if (opt & OPT_LIST) {
+ if ((fflag == NULL) ||
+ ((fflag != NULL) && ffound))
+ return (0);
+ }
+ return (-1);
}
/*
pgpk_4KNOnPjY.pgp
Description: PGP signature
