Update.

	* sysdeps/unix/sysv/linux/gethostid.c: Find hostid file in /etc.

	* sysdeps/mips/dl-machine.h (RESOLVE_GOTSYM): Fix calls to dl_lookup.

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5d56026cf8..b34028a993 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-09-07  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/gethostid.c: Find hostid file in /etc.
+
 	* scripts/config.sub: Strip out -unknown for Linux targets.
 	Patch by Scott Bambrough <scottb@netwinder.org>.
 
@@ -15,8 +17,7 @@
 
 	* sysdeps/unix/sysv/linux/mips/syscalls.list: Add __syscall_fcntl.
 
-	* sysdeps/mips/dl-machine.h (RESOLVE_GOTSYM): Fix calls to
-	dl_lookup.
+	* sysdeps/mips/dl-machine.h (RESOLVE_GOTSYM): Fix calls to dl_lookup.
 	(ELF_MACHINE_RUNTIME_TRAMPOLINE): Likewise.
 
 	* sysdeps/unix/sysv/linux/mips/fcntl.c: New file.
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 <unistd.h>
 #include <netdb.h>
 
-#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));