Browse Source

uroot.cpio.lzma is now the initrd rather than embedded in the kernel ramdisk

Signed-off-by: Graham MacDonald <grahamamacdonald@gmail.com>
Graham MacDonald 3 years ago
parent
commit
220848f883
3 changed files with 4 additions and 4 deletions
  1. 2 2
      rc/bin/urootrc
  2. 1 2
      sys/src/9/amd64/allbuild.json
  3. 1 0
      util/GO9PUROOT

+ 2 - 2
rc/bin/urootrc

@@ -1,9 +1,9 @@
 #!/bin/rc
 # terminal startup
 
-if(test -e '/boot/uroot') {
+if(test -e '#P/uroot.cpio.lzma') {
 	# Unpack uroot cpio into the ramdisk and bind to root
-	@{cd '#@' && /boot/decompress /boot/uroot | /boot/cpio i}
+	@{cd '#@' && /boot/decompress '#P/uroot.cpio.lzma' | /boot/cpio i}
 	bind -b '#@' /
 	bind -b /bbin /bin
 }

+ 1 - 2
sys/src/9/amd64/allbuild.json

@@ -123,8 +123,7 @@
 				"urootrc": "/rc/bin/urootrc",
 				"usbd": "/$ARCH/bin/usb/usbd",
 				"venti": "/$ARCH/bin/venti/venti",
-				"vga": "/$ARCH/bin/aux/vga",
-				"uroot": "uroot.cpio.lzma"
+				"vga": "/$ARCH/bin/aux/vga"
 			},
 			"Systab": "/sys/src/libc/9syscall/sys.h"
 		},

+ 1 - 0
util/GO9PUROOT

@@ -21,6 +21,7 @@ fi
 
 read -r cmd <<EOF
 $kvmdo qemu-system-x86_64 -s -cpu max,vmware-cpuid-freq=on,+invtsc -smp 4 -m 2048 $kvmflag \
+-initrd sys/src/9/amd64/uroot.cpio.lzma \
 -usb \
 -serial stdio \
 --machine $machineflag \