[uml-devel] uts machinename Issues

[Lennert B. <bu...@gn...>]

Hi,

umls running on my i686 report that they run on a i386. This prohibits
me from, for example, installing i686 rpms. Does the included patch
look sane?


cheers,
Lennert



--- ./arch/um/kernel/um_arch.c.orig	Sun Mar  4 18:08:50 2001
+++ ./arch/um/kernel/um_arch.c	Sun Mar  4 18:11:00 2001
@@ -120,6 +120,15 @@
 void *brk_start;
 int brk_fd;
 
+#include <sys/utsname.h>
+static void setup_machinename()
+{
+	struct utsname host;
+
+	uname(&host);
+	strcpy(system_utsname.machine, host.machine);
+}
+
 int linux_main(int argc, char **argv)
 {
 	unsigned long start_pfn, end_pfn, bootmap_size;
@@ -164,7 +173,7 @@
 	}
 	if(have_root == 0) add_arg(saved_command_line, DEFAULT_COMMAND_LINE);
 
-	strcpy(system_utsname.machine, STRING(SUBARCH));
+	setup_machinename();
 
 	argv1_begin = argv[1];
 	argv1_end = &argv[argc - 1][strlen(argv[argc - 1])];