From owner-svn-src-all@FreeBSD.ORG Thu Jan 6 21:09:22 2011 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 5897D106567A; Thu, 6 Jan 2011 21:09:22 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 48A948FC08; Thu, 6 Jan 2011 21:09:22 +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 p06L9MTt028559; Thu, 6 Jan 2011 21:09:22 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p06L9Mdg028557; Thu, 6 Jan 2011 21:09:22 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201101062109.p06L9Mdg028557@svn.freebsd.org> From: Warner Losh Date: Thu, 6 Jan 2011 21:09:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217073 - head/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: Thu, 06 Jan 2011 21:09:22 -0000 Author: imp Date: Thu Jan 6 21:09:22 2011 New Revision: 217073 URL: http://svn.freebsd.org/changeset/base/217073 Log: Don't require /usr/lib/aout to be on the system. Test for its existance since we don't generally need it. MFC after: 1 week Modified: head/etc/rc.d/ldconfig Modified: head/etc/rc.d/ldconfig ============================================================================== --- head/etc/rc.d/ldconfig Thu Jan 6 21:08:06 2011 (r217072) +++ head/etc/rc.d/ldconfig Thu Jan 6 21:09:22 2011 (r217073) @@ -66,8 +66,8 @@ ldconfig_start() i386) # Default the a.out ldconfig path. : ${ldconfig_paths_aout=${ldconfig_paths}} - _LDC=/usr/lib/aout - for i in ${ldconfig_paths_aout} /etc/ld.so.conf; do + _LDC="" + for i in /usr/lib/aout ${ldconfig_paths_aout} /etc/ld.so.conf; do if [ -r "${i}" ]; then _LDC="${_LDC} ${i}" fi