From owner-svn-src-head@freebsd.org Sat Nov 30 17:30:02 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 528FB1B177A; Sat, 30 Nov 2019 17:30:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47QJKk1XQCz4GJg; Sat, 30 Nov 2019 17:30:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 173151A54; Sat, 30 Nov 2019 17:30:02 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAUHU14D054617; Sat, 30 Nov 2019 17:30:01 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAUHU1jH054616; Sat, 30 Nov 2019 17:30:01 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201911301730.xAUHU1jH054616@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Sat, 30 Nov 2019 17:30:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355232 - head/libexec/rc/rc.d X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/libexec/rc/rc.d X-SVN-Commit-Revision: 355232 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Nov 2019 17:30:02 -0000 Author: mjg Date: Sat Nov 30 17:30:01 2019 New Revision: 355232 URL: https://svnweb.freebsd.org/changeset/base/355232 Log: ldconfig: fetch hw.machine_arch only once This happens to be of significance with poudriere which runs the script a lot when installing packages. Modified: head/libexec/rc/rc.d/ldconfig Modified: head/libexec/rc/rc.d/ldconfig ============================================================================== --- head/libexec/rc/rc.d/ldconfig Sat Nov 30 17:24:42 2019 (r355231) +++ head/libexec/rc/rc.d/ldconfig Sat Nov 30 17:30:01 2019 (r355232) @@ -40,7 +40,9 @@ ldconfig_start() check_startmsgs && echo 'ELF ldconfig path:' ${_LDC} ${ldconfig} -elf ${_ins} ${_LDC} - case `sysctl -n hw.machine_arch` in + machine_arch=$(sysctl -n hw.machine_arch) + + case ${machine_arch} in amd64|mips64|powerpc64) for i in ${ldconfig_local32_dirs}; do if [ -d "${i}" ]; then @@ -62,7 +64,7 @@ ldconfig_start() ;; esac - case `sysctl -n hw.machine_arch` in + case ${machine_arch} in armv[67]) for i in ${ldconfig_localsoft_dirs}; do if [ -d "${i}" ]; then @@ -85,7 +87,7 @@ ldconfig_start() esac # Legacy aout support for i386 only - case `sysctl -n hw.machine_arch` in + case ${machine_arch} in i386) # Default the a.out ldconfig path. : ${ldconfig_paths_aout=${ldconfig_paths}}