Commit 0ce451ac authored by Richard Weinberger's avatar Richard Weinberger Committed by Linus Torvalds

um: fix UML_LIB_PATH

UML_LIB_PATH is hardcoded to /usr/lib/uml/, on 64bit systems UML_LIB_PATH
needs to be /usr/lib64/uml/.
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8aebe21e
...@@ -90,7 +90,7 @@ static int xterm_open(int input, int output, int primary, void *d, ...@@ -90,7 +90,7 @@ static int xterm_open(int input, int output, int primary, void *d,
int pid, fd, new, err; int pid, fd, new, err;
char title[256], file[] = "/tmp/xterm-pipeXXXXXX"; char title[256], file[] = "/tmp/xterm-pipeXXXXXX";
char *argv[] = { terminal_emulator, title_switch, title, exec_switch, 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 }; file, NULL };
if (access(argv[4], X_OK) < 0) if (access(argv[4], X_OK) < 0)
......
...@@ -29,6 +29,12 @@ ...@@ -29,6 +29,12 @@
#define OS_ACC_R_OK 4 /* Test for read permission. */ #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 */ #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 * types taken from stat_file() in hostfs_user.c
* (if they are wrong here, they are wrong there...). * (if they are wrong here, they are wrong there...).
......
...@@ -78,7 +78,7 @@ static void install_fatal_handler(int sig) ...@@ -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) static void setup_env_path(void)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment