diff options
| author | jkh <jkh@FreeBSD.org> | 1998-03-13 11:12:53 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-03-13 11:12:53 +0000 |
| commit | dc04bde8c287af132aa349019e76b91dc689e308 (patch) | |
| tree | 1ee0996f2d1249124504766f2741482ece73425d /release | |
| parent | 206a0af8ed276963769678c9051c37d88f73abf2 (diff) | |
| download | FreeBSD-src-dc04bde8c287af132aa349019e76b91dc689e308.zip FreeBSD-src-dc04bde8c287af132aa349019e76b91dc689e308.tar.gz | |
Be careful not to spam ld.so.hints in multi-user case.
Submitted by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
Diffstat (limited to 'release')
| -rw-r--r-- | release/sysinstall/config.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index ca9e68a..3f406ab 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.107 1998/03/09 15:00:43 jkh Exp $ + * $Id: config.c,v 1.108 1998/03/10 17:24:03 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -510,7 +510,10 @@ configXEnvironment(dialogMenuItem *self) dialog_clear_norefresh(); if (!dmenuOpenSimple(&MenuXF86Config, FALSE)) return DITEM_FAILURE | DITEM_RESTORE; - systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); + if (file_readable("/var/run/ld.so.hints")) + systemExecute("/sbin/ldconfig -m /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); + else + systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); config = variable_get(VAR_XF86_CONFIG); if (!config) return DITEM_FAILURE | DITEM_RESTORE; |
