diff options
| author | olgeni <olgeni@FreeBSD.org> | 2001-05-12 19:39:13 +0000 |
|---|---|---|
| committer | olgeni <olgeni@FreeBSD.org> | 2001-05-12 19:39:13 +0000 |
| commit | 9c900961b8e42d4e3b23a9bcbf852b24cb599885 (patch) | |
| tree | 119736de7b33600b791d85d1597d3eef1a09103a /usr.sbin | |
| parent | 7d7dc78760f49107286b0d30b18eb704ef28a474 (diff) | |
| download | FreeBSD-src-9c900961b8e42d4e3b23a9bcbf852b24cb599885.zip FreeBSD-src-9c900961b8e42d4e3b23a9bcbf852b24cb599885.tar.gz | |
Check for both hint files in /var/run (elf and aout) and eventually create
them.
Sysinstall used to check /var/run/ld.so.hints (aout related) and create
hints with the ldconfig command, but the ldconfig command alone will
generate elf hints only. The correct behavior is:
* If /var/run/ld-elf.so.hints does not exist, generate elf hints
* If /var/run/ld.so.hints does not exist, generate aout hints
(using ldconfig with the -aout option)
This will help ports that check for aout libraries using ldconfig in their
pkg-req scripts.
Approved by: jkh
MFC after: 1 weeks
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sysinstall/package.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c index eb468aa..577421f 100644 --- a/usr.sbin/sysinstall/package.c +++ b/usr.sbin/sysinstall/package.c @@ -129,8 +129,10 @@ package_extract(Device *dev, char *name, Boolean depended) } /* If necessary, initialize the ldconfig hints */ - if (!file_readable("/var/run/ld.so.hints")) + if (!file_readable("/var/run/ld-elf.so.hints")) vsystem("ldconfig /usr/lib /usr/lib/compat /usr/local/lib /usr/X11R6/lib"); + if (!file_readable("/var/run/ld.so.hints")) + vsystem("ldconfig -aout /usr/lib/aout /usr/lib/compat/aout /usr/local/lib/aout /usr/X11R6/lib/aout"); /* Be initially optimistic */ ret = DITEM_SUCCESS; |
