1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
|
# DP: Make it so that a missing /etc/ld.so.conf does not cause an error
# DP: message, unless --verbose is enabled. This keeps the debian
# DP: installer from barfing during bootstrap of the system.
# DP:
# DP: Updated by gotom, the previous one seems being wrong because it suppresses
# DP: _all_ warnings about "can't open configuration file". otoh, I introduce
# DP: newer patches. it should be checked using chroot and should be contacted
# DP: to the upstream.
# DP: Date: (Updated 2005-01-02 gotom)
# previous patch.
#--- elf/ldconfig.c 2003-07-08 23:26:27.000000000 +0900
#+++ elf/ldconfig.c.debian 2003-07-08 23:29:43.000000000 +0900
#@@ -920,26 +920,24 @@
# {
# FILE *file = NULL;
# char *line = NULL;
#- const char *canon;
#+ const char *canon = filename;
# size_t len = 0;
#+ int file_fd;
#
# if (opt_chroot)
# {
# canon = chroot_canon (opt_chroot, filename);
#- if (canon)
#- file = fopen (canon, "r");
#- else
#+ if (!canon)
# canon = filename;
# }
#- else
#- {
#- canon = filename;
#- file = fopen (filename, "r");
#- }
#+
#+ if ((file_fd = open(canon, O_RDONLY | O_EXCL, 0022)) != -1)
#+ file = fdopen (file_fd, "r");
#
# if (file == NULL)
# {
#- error (0, errno, _("Can't open configuration file %s"), canon);
#+ if (opt_verbose)
#+ error (0, errno, _("Can't open configuration file %s"), canon);
# if (canon != filename)
# free ((char *) canon);
# return;
2004-10-25 GOTO Masanori <gotom@debian.or.jp>
* elf/ldconfig.c: Don't print error when default ld.so.conf
is not existed.
---
elf/ldconfig.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -1064,9 +1064,10 @@
if (file == NULL)
{
- error (0, errno, _("\
+ if (strcmp(canon, LD_SO_CONF) != 0 || opt_verbose)
+ error (0, errno, _("\
Warning: ignoring configuration file that cannot be opened: %s"),
- canon);
+ canon);
if (canon != filename)
free ((char *) canon);
return;
|