From e0baae12647612af5f12f0563a65f03514603359 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 7 Sep 2000 18:13:12 +0000 Subject: Update. * sysdeps/unix/sysv/linux/gethostid.c: Find hostid file in /etc. * sysdeps/mips/dl-machine.h (RESOLVE_GOTSYM): Fix calls to dl_lookup. --- sysdeps/unix/sysv/linux/gethostid.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sysdeps') diff --git a/sysdeps/unix/sysv/linux/gethostid.c b/sysdeps/unix/sysv/linux/gethostid.c index 6f501e391d..f51b3a2197 100644 --- a/sysdeps/unix/sysv/linux/gethostid.c +++ b/sysdeps/unix/sysv/linux/gethostid.c @@ -21,7 +21,8 @@ #include #include -#define HOSTIDFILE "/var/adm/hostid" +#define HOSTIDFILE "/etc/hostid" +#define OLD_HOSTIDFILE "/etc/hostid" #ifdef SET_PROCEDURE int @@ -70,6 +71,8 @@ gethostid () /* First try to get the ID from a former invocation of sethostid. */ fd = __open (HOSTIDFILE, O_RDONLY); + if (fd < 0) + fd = __open (OLD_HOSTIDFILE, O_RDONLY); if (fd >= 0) { ssize_t n = __read (fd, &id, sizeof (id)); -- cgit v1.2.3