Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix machine name returned by uname on Linux

Browse Source
This commit is contained in:
manu 2005-11-04 16:58:14 +00:00
parent 78ad642708
commit b72e0d5382
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/compat/linux/arch/amd64/linux_machdep.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.h,v 1.2 2005/05/20 12:48:27 fvdl Exp $ */
/* $NetBSD: linux_machdep.h,v 1.3 2005/11/04 16:58:14 manu Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@ -100,7 +100,6 @@ struct linux_rt_sigframe {
struct linux_siginfo info;
};
#ifdef _KERNEL
__BEGIN_DECLS
void linux_syscall_intern __P((struct proc *));
@ -111,4 +110,6 @@ __END_DECLS
#define LINUX_VSYSCALL_SIZE 1024
#define LINUX_VSYSCALL_MAXNR 3
#define LINUX_UNAME_ARCH machine_arch
#endif /* _AMD64_LINUX_MACHDEP_H */

8
sys/compat/linux/common/linux_misc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_misc.c,v 1.141 2005/10/30 16:25:50 chs Exp $ */
/* $NetBSD: linux_misc.c,v 1.142 2005/11/04 16:58:14 manu Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.141 2005/10/30 16:25:50 chs Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.142 2005/11/04 16:58:14 manu Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -452,7 +452,11 @@ linux_sys_uname(l, v, retval)
strncpy(luts.l_nodename, hostname, sizeof(luts.l_nodename));
strncpy(luts.l_release, linux_release, sizeof(luts.l_release));
strncpy(luts.l_version, linux_version, sizeof(luts.l_version));
#ifdef LINUX_UNAME_ARCH
strncpy(luts.l_machine, LINUX_UNAME_ARCH, sizeof(luts.l_machine));
#else
strncpy(luts.l_machine, machine, sizeof(luts.l_machine));
#endif
strncpy(luts.l_domainname, domainname, sizeof(luts.l_domainname));
return copyout(&luts, SCARG(uap, up), sizeof(luts));