From owner-svn-src-all@FreeBSD.ORG Sun Jan 17 11:10:33 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4C6B1065758; Sun, 17 Jan 2010 11:10:33 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F36138FC0A; Sun, 17 Jan 2010 11:10:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0HBAWhY002945; Sun, 17 Jan 2010 11:10:32 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0HBAWuR002943; Sun, 17 Jan 2010 11:10:32 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201001171110.o0HBAWuR002943@svn.freebsd.org> From: Gavin Atkinson Date: Sun, 17 Jan 2010 11:10:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202465 - stable/7/etc/rc.d X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jan 2010 11:10:34 -0000 Author: gavin Date: Sun Jan 17 11:10:32 2010 New Revision: 202465 URL: http://svn.freebsd.org/changeset/base/202465 Log: Merge r201440, r201445 from head: Don't complain when we encounter the "cache" source, it's valid. Also fix the error message to include a line feed and not include a stray comma. Submitted by: Artis Caune artis.caune gmail.com While here, change "> /dev/stderr" for more usual ">&2" Submitted by: jilles PR: bin/121671 Approved by: ed (mentor, implicit) Modified: stable/7/etc/rc.d/nsswitch Directory Properties: stable/7/etc/rc.d/ (props changed) Modified: stable/7/etc/rc.d/nsswitch ============================================================================== --- stable/7/etc/rc.d/nsswitch Sun Jan 17 11:10:24 2010 (r202464) +++ stable/7/etc/rc.d/nsswitch Sun Jan 17 11:10:32 2010 (r202465) @@ -77,10 +77,10 @@ generate_host_conf() nis) echo "nis" >> $host_conf ;; - *=*) + cache | *=*) ;; *) - printf "Warning: unrecognized source [%s]", $_s > "/dev/stderr" + printf "Warning: unrecognized source [%s]\n" $_s >&2 ;; esac done