Merge branch 'amd64' of https://github.com/elbing/plan9-gpl into amd64

BUILD

@@ -180,8 +180,11 @@ compile_kernel()
     echo "${UTIL_DIR}/data2c boot_fs boot.fs >> k8cpu.root.c"
     ${UTIL_DIR}/data2c boot_fs boot.fs >> k8cpu.root.c
 	check_error $? "executing data2c"
-    echo "${UTIL_DIR}/data2c rcmain rcmain >> k8cpu.root.c"
-    ${UTIL_DIR}/data2c rcmain rcmain >> k8cpu.root.c
+
+	echo "cp ${BASEDIR}/rc/lib/rcmain rcmain"
+	cp ${BASEDIR}/rc/lib/rcmain rcmain
+    echo "${UTIL_DIR}/data2c _rc_lib_rcmain rcmain >> k8cpu.root.c"
+    ${UTIL_DIR}/data2c _rc_lib_rcmain rcmain >> k8cpu.root.c
 	check_error $? "executing data2c"
 	##### FACTOTUM ######
 	

sys/src/9/k10/boot.fs

@@ -2,4 +2,4 @@
 /boot/echo Morning
 # boot script for file servers, including standalone ones
 path=(/boot /$cputype/bin /rc/bin .)
-exec /boot/rc -m/boot/rcmain -i
+exec /boot/rc -m /boot/rcmain -i

sys/src/9/k10/k8cpu

@@ -78,7 +78,7 @@ rootdir
 #	/amd64/bin/auth/factotum factotum
 #	/amd64/bin/ip/ipconfig ipconfig
 	/amd64/bin/rc rc
-	rcmain rcmain
+	/rc/lib/rcmain rcmain
 #	../root/nvram nvram
 
 conf

sys/src/cmd/rc/exec.c

@@ -203,25 +203,7 @@ void put64(uint64_t v)
 void
 main(int argc, char *argv[])
 {
-	char line[128];
-	int amt;
-	hi("HI!\n");
-	int cnt;
-	put64((uint64_t)argc); hi(" "); put64((uint64_t)argv); hi("\n");
-	amt = sprint(line, "----------->argc %d argv %p,<------\n", argc, argv);
-	write(1, line, amt);
-	while (cnt++ < 4) {
-		write(1, "hi\n", 3);
-		amt = read(0, line, 128);
-		if (amt < 0) {
-			char *panic = "PANIC! Can't read stdin\n"; 
-			write(1, panic, strlen(panic));
-			return;
-		}
-		line[amt] = 0;
-		print(line);
-		print("Hello, I am Harvey!!\n");
-	}
+	print("Hello, I am Harvey!!\n");
 	code bootstrap[17];
 	char num[12], *rcmain;
 	int i;