merge

[plan9front.git] / sys / src / 9 / kw / plug

diff --git a/sys/src/9/kw/plug b/sys/src/9/kw/plug
index 7fe107ba6e65c2a11e28e24496781129882aa0e4..1d0dc9471ca91ef2d4f50d35aa3e8b0e25bb2508 100644 (file)
--- a/sys/src/9/kw/plug
+++ b/sys/src/9/kw/plug
@@ -3,11 +3,13 @@
 dev
        root
        cons
+       swap
        env
        pipe
        proc
        mnt
        srv
+       shr
        dup
        rtc
        arch
@@ -57,7 +59,6 @@ misc
        coproc
        sdaoe           sdscsi
        softfpu
-       syscall
        uartkw
        ucalloc
 ##     vgavesa
@@ -66,15 +67,8 @@ port
        int cpuserver = 1;
        int i8250freq = 3686000;
 
-boot cpu
-       tcp
-#      paq
-
 bootdir
-       boot$CONF.out boot
-       /arm/bin/ip/ipconfig
-       /arm/bin/auth/factotum
-#      /arm/bin/paqfs
-       /arm/bin/usb/usbd
-# nvram not needed any longer, it's in flash
-       nvram
+       /$objtype/bin/paqfs
+       /$objtype/bin/auth/factotum
+       bootfs.paq
+       boot