linux-um archives
 help / color / mirror / Atom feed
* [PATCH 1/7] um: fix UML_LIB_PATH
@ 2011-05-22 14:48 Richard Weinberger
  2011-05-22 14:48 ` [uml-devel] [PATCH 2/7] um: remove SIGHUP handler Richard Weinberger
                   ` (5 more replies)
  0 siblings, 6 replies; 10+ messages in thread
From: Richard Weinberger @ 2011-05-22 14:48 UTC (permalink / raw)
  To: akpm; +Cc: user-mode-linux-devel, linux-kernel, Richard Weinberger

UML_LIB_PATH is hardcoded to /usr/lib/uml/,
on 64bit systems UML_LIB_PATH needs to be /usr/lib64/uml/.

Signed-off-by: Richard Weinberger <richard@nod.at>
---
 arch/um/drivers/xterm.c     |    2 +-
 arch/um/include/shared/os.h |    6 ++++++
 arch/um/os-Linux/main.c     |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
index da2caa5..8ac7146 100644
--- a/arch/um/drivers/xterm.c
+++ b/arch/um/drivers/xterm.c
@@ -90,7 +90,7 @@ static int xterm_open(int input, int output, int primary, void *d,
 	int pid, fd, new, err;
 	char title[256], file[] = "/tmp/xterm-pipeXXXXXX";
 	char *argv[] = { terminal_emulator, title_switch, title, exec_switch,
-			 "/usr/lib/uml/port-helper", "-uml-socket",
+			 OS_LIB_PATH "/uml/port-helper", "-uml-socket",
 			 file, NULL };
 
 	if (access(argv[4], X_OK) < 0)
diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h
index c4617ba..f06a5da 100644
--- a/arch/um/include/shared/os.h
+++ b/arch/um/include/shared/os.h
@@ -29,6 +29,12 @@
 #define OS_ACC_R_OK    4       /* Test for read permission.  */
 #define OS_ACC_RW_OK   (OS_ACC_W_OK | OS_ACC_R_OK) /* Test for RW permission */
 
+#ifdef CONFIG_64BIT
+#define OS_LIB_PATH	"/usr/lib64/"
+#else
+#define OS_LIB_PATH	"/usr/lib/"
+#endif
+
 /*
  * types taken from stat_file() in hostfs_user.c
  * (if they are wrong here, they are wrong there...).
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index eee69b9..39613ea 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -78,7 +78,7 @@ static void install_fatal_handler(int sig)
 	}
 }
 
-#define UML_LIB_PATH	":/usr/lib/uml"
+#define UML_LIB_PATH	":" OS_LIB_PATH "/uml"
 
 static void setup_env_path(void)
 {
-- 
1.7.4.2


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2011-05-24 20:14 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-22 14:48 [PATCH 1/7] um: fix UML_LIB_PATH Richard Weinberger
2011-05-22 14:48 ` [uml-devel] [PATCH 2/7] um: remove SIGHUP handler Richard Weinberger
2011-05-22 14:48 ` [uml-devel] [PATCH 3/7] um: add earlyprintk support Richard Weinberger
2011-05-22 14:48 ` [uml-devel] [PATCH 4/7] um: add ucast ethernet transport Richard Weinberger
2011-05-22 14:48 ` [uml-devel] [PATCH 5/7] um: print info about fatal segfaults Richard Weinberger
2011-05-24 19:34   ` Andrew Morton
2011-05-24 20:02     ` [uml-devel] [PATCH] checkpatch: Add warning for uses of printk_ratelimit Joe Perches
2011-05-24 20:14     ` [PATCH 5/7] um: print info about fatal segfaults Richard Weinberger
2011-05-22 14:48 ` [uml-devel] [PATCH 6/7] um: include linux/prefetch.h Richard Weinberger
2011-05-22 14:48 ` [uml-devel] [PATCH 7/7] um: fix crash while os_dump_core() Richard Weinberger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox