patch-pre2.0.2 linux/fs/binfmt_java.c

Next file: linux/include/linux/blk.h
Previous file: linux/fs/affs/dir.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file pre2.0.1/linux/fs/binfmt_java.c linux/fs/binfmt_java.c
@@ -12,9 +12,9 @@
 #include <linux/binfmts.h>
 #include <paths.h>
 
-#define _PATH_JAVA	"/usr/local/java/bin/java"
-#define _PATH_APPLET	"/usr/local/java/bin/appletviewer"
-#define _PATH_BASH	"/bin/bash"
+#define _PATH_JAVA	"/usr/bin/java"
+#define _PATH_APPLET	"/usr/bin/appletviewer"
+#define _PATH_SH	"/bin/sh"
 
 static int do_load_script(struct linux_binprm *bprm,struct pt_regs *regs)
 {
@@ -29,7 +29,7 @@
 
 	/*
 	 * OK, we've set the interpreter name
-	 * Splice in (1) the interpreter's name for argv[0] (_PATH_BASH)
+	 * Splice in (1) the interpreter's name for argv[0] (_PATH_SH)
 	 *           (2) the name of the java wrapper for argv[1] (_PATH_JAVA)
 	 *           (3) filename of Java class (replace argv[0])
 	 *               without leading path or trailing '.class'
@@ -52,7 +52,7 @@
 	bprm->p = copy_strings(1, &cp, bprm->page, bprm->p, 2);
 	bprm->argc++;
 
-	strcpy (bprm->buf, _PATH_BASH);
+	strcpy (bprm->buf, _PATH_SH);
 	interp = bprm->buf;
 	if ((i_name = strrchr (bprm->buf, '/')) != NULL)
 		i_name++;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this