Browse Source

Use the boot.fs script for /boot

This successfully starts rc and uses rcmain as its startup script.

We can now script.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Ronald G. Minnich 9 years ago
parent
commit
82e368ee92
2 changed files with 11 additions and 1 deletions
  1. 8 0
      BUILD
  2. 3 1
      sys/src/9/k10/k8cpu

+ 8 - 0
BUILD

@@ -143,6 +143,14 @@ compile_kernel()
     ${UTIL_DIR}/data2c "boot$CONF"_out boot$CONF.elf.out >> k8cpu.root.c
 	check_error $? "executing data2c"
 	
+
+	# we need a WAY better way to do this. We're having to do it for each file.
+    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
+	check_error $? "executing data2c"
 	##### FACTOTUM ######
 	
 	##cp /sys/src/cmd/auth/factotum/factotum.elf.out factotum.elf.out

+ 3 - 1
sys/src/9/k10/k8cpu

@@ -73,10 +73,12 @@ boot cpu
 	tcp
 
 rootdir
+	boot.fs boot
 #	bootk8cpu.out boot
 #	/amd64/bin/auth/factotum factotum
 #	/amd64/bin/ip/ipconfig ipconfig
-	/amd64/bin/rc boot
+	/amd64/bin/rc rc
+	rcmain rcmain
 #	../root/nvram nvram
 
 conf