Date: Sun, 15 Aug 2010 08:44:32 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r211325 - head/usr.sbin/config Message-ID: <201008150844.o7F8iWsB052952@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sun Aug 15 08:44:32 2010 New Revision: 211325 URL: http://svn.freebsd.org/changeset/base/211325 Log: 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 Modified: head/usr.sbin/config/mkoptions.c Modified: head/usr.sbin/config/mkoptions.c ============================================================================== --- head/usr.sbin/config/mkoptions.c Sun Aug 15 08:38:48 2010 (r211324) +++ head/usr.sbin/config/mkoptions.c Sun Aug 15 08:44:32 2010 (r211325) @@ -351,9 +351,11 @@ update_option(const char *this, char *va 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008150844.o7F8iWsB052952>