summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRitesh Raj Sarraf2018-09-20 08:26:38 +0200
committerGreg Kroah-Hartman2019-05-16 19:41:28 +0200
commitdb1b4aa651df06e90efc2424d3a83bcf02fe93a5 (patch)
tree6711d0f37317fce787c5694429ab6d8431a25f3c
parentDon't jump to compute_result state from check_result state (diff)
downloadkernel-qcow2-linux-db1b4aa651df06e90efc2424d3a83bcf02fe93a5.tar.gz
kernel-qcow2-linux-db1b4aa651df06e90efc2424d3a83bcf02fe93a5.tar.xz
kernel-qcow2-linux-db1b4aa651df06e90efc2424d3a83bcf02fe93a5.zip
um: Don't hardcode path as it is architecture dependent
commit 9ca19a3a3e2482916c475b90f3d7fa2a03d8e5ed upstream. The current code fails to run on amd64 because of hardcoded reference to i386 Signed-off-by: Ritesh Raj Sarraf <rrs@researchut.com> Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/um/drivers/port_user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
index 9a8e1b64c22e..5f56d11b886f 100644
--- a/arch/um/drivers/port_user.c
+++ b/arch/um/drivers/port_user.c
@@ -168,7 +168,7 @@ int port_connection(int fd, int *socket, int *pid_out)
{
int new, err;
char *argv[] = { "/usr/sbin/in.telnetd", "-L",
- "/usr/lib/uml/port-helper", NULL };
+ OS_LIB_PATH "/uml/port-helper", NULL };
struct port_pre_exec_data data;
new = accept(fd, NULL, 0);