summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2010-08-15 08:44:32 +0000
committerimp <imp@FreeBSD.org>2010-08-15 08:44:32 +0000
commit60ebbbda54dee74316fc44a7e177bd99e69fb170 (patch)
tree0f57ca40109a40d219dfd4a98375be171d5c53c1
parenta8c3aca2c474d43e194d174791ef35ecdf0b380d (diff)
downloadFreeBSD-src-60ebbbda54dee74316fc44a7e177bd99e69fb170.zip
FreeBSD-src-60ebbbda54dee74316fc44a7e177bd99e69fb170.tar.gz
Turns out that it is a bad idea to have a missing compat option be a
fatal condition. While it works out really well for diagnosing the case where you want it, but don't have it, it works really badly for the case where you don't have it and don't want it. Remove the printf and exit pair. Replate it with simple return to silently ignore this condition. This is needed to fix the COMPAT_IA32 being required in options.* in stable, but we need to run this change through -current first... MFC after: 3 days
-rw-r--r--usr.sbin/config/mkoptions.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/config/mkoptions.c b/usr.sbin/config/mkoptions.c
index efa8972..b5d6e34 100644
--- a/usr.sbin/config/mkoptions.c
+++ b/usr.sbin/config/mkoptions.c
@@ -351,9 +351,11 @@ update_option(const char *this, char *val, int flags)
return;
}
}
- fprintf(stderr, "Compat option %s not listed in options file.\n",
- this);
- exit(1);
+ /*
+ * Option not found, but that's OK, we just ignore it since it
+ * may be for another arch.
+ */
+ return;
}
static int
OpenPOWER on IntegriCloud