summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-12-11 09:19:39 +0100
committerFlorian Weimer <fweimer@redhat.com>2019-12-11 09:19:39 +0100
commitb5a1271c76ad03a2e0ee044ecb46af03d771e40a (patch)
tree2eddf656c5f6cfb54ac60e465d4949c1263887f8 /elf
parente46efff89550a8e693a3362976f85070762c5cb8 (diff)
downloadglibc-b5a1271c76ad03a2e0ee044ecb46af03d771e40a.tar.gz
glibc-b5a1271c76ad03a2e0ee044ecb46af03d771e40a.tar.xz
glibc-b5a1271c76ad03a2e0ee044ecb46af03d771e40a.zip
ldconfig: Do not print a warning for a missing ld.so.conf file
The configuration file is not needed for working system, so printing a
warning is not helpful.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'elf')
-rw-r--r--elf/ldconfig.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 139161b3a6..62bbe77a88 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -1079,9 +1079,10 @@ parse_conf (const char *filename, bool do_chroot)
 
   if (file == NULL)
     {
-      error (0, errno, _("\
+      if (errno != ENOENT)
+	error (0, errno, _("\
 Warning: ignoring configuration file that cannot be opened: %s"),
-	     canon);
+	       canon);
       if (canon != filename)
 	free ((char *) canon);
       return;