From owner-cvs-all Tue Sep 15 22:42:56 1998 Return-Path: Received: (from daemon@localhost) by hub.freebsd.org (8.8.8/8.8.8) id WAA05224 for cvs-all-outgoing; Tue, 15 Sep 1998 22:42:56 -0700 (PDT) (envelope-from owner-cvs-all) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id WAA05218; Tue, 15 Sep 1998 22:42:55 -0700 (PDT) (envelope-from jdp@FreeBSD.org) From: John Polstra Received: (from jdp@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id WAA17408; Tue, 15 Sep 1998 22:42:39 -0700 (PDT) Date: Tue, 15 Sep 1998 22:42:39 -0700 (PDT) Message-Id: <199809160542.WAA17408@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: cvs commit: src/etc rc rc.conf Sender: owner-cvs-all@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jdp 1998/09/15 22:42:38 PDT Modified files: etc rc rc.conf Log: Fix up the boot-time ldconfig handling to deal with dual object file formats. I have added a new rc.conf variable ${ldconfig_paths_aout} which is like ${ldconfig_paths}, but only for a.out shared libraries. On a "standard" ELF system, the ELF ldconfig path is taken from ${ldconfig_paths}, while the a.out ldconfig path is taken from ${ldconfig_paths_aout}. On a not-yet-converted a.out system, only the a.out ldconfig path is set, and it is taken from ${ldconfig_paths_aout}. If that variable is unset, /etc/rc defaults it to the value of ${ldconfig_paths}, on the assumption that the system's "/etc/rc.conf" file hasn't been updated. Revision Changes Path 1.156 +16 -2 src/etc/rc 1.58 +2 -1 src/etc/rc.conf