From 7b69bf4cab8f44d766ed11e3176da2eb8b7ce2f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Thu, 31 Dec 2015 02:48:44 +0100 Subject: [PATCH] Ninjafix unbootable floppy --- .../Plan9k/lib/modules/base/16_component.lua | 21 +++++++++++-------- .../loot/Plan9k/var/lib/mpt/config.db | 2 +- .../loot/Plan9k/var/lib/mpt/mpt.db | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/16_component.lua b/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/16_component.lua index 9160472f6..de0428096 100644 --- a/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/16_component.lua +++ b/src/main/resources/assets/opencomputers/loot/Plan9k/lib/modules/base/16_component.lua @@ -1,5 +1,8 @@ -local component = {} +local rawComponent = kernel._K.component +component = {} + kernel.userspace.component = component +kernel._K.component = component kernelGroup = { adding = {}, @@ -17,7 +20,7 @@ end component.doc = function(addr, method) if allow(addr) then - return kernel._K.component.doc(addr, method) + return rawComponent.doc(addr, method) else error("no such component") end @@ -25,7 +28,7 @@ end component.invoke = function(addr, ...) if allow(addr) then - return kernel._K.component.invoke(addr, ...) + return rawComponent.invoke(addr, ...) else error("no such component") end @@ -33,7 +36,7 @@ end component.list = function(filter, exact) local list = {} - for k, v in pairs(kernel._K.component.list(filter, not not exact)) do + for k, v in pairs(rawComponent.list(filter, not not exact)) do if allow(k) then list[k] = v end @@ -49,7 +52,7 @@ end component.methods = function(addr) if allow(addr) then - return kernel._K.component.methods(addr) + return rawComponent.methods(addr) else return nil, "no such component" end @@ -57,7 +60,7 @@ end component.fields = function(addr) if allow(addr) then - return kernel._K.component.fields(addr) + return rawComponent.fields(addr) else return nil, "no such component" end @@ -65,7 +68,7 @@ end component.proxy = function(addr) if allow(addr) then - return kernel._K.component.proxy(addr) + return rawComponent.proxy(addr) else return nil, "no such component" end @@ -73,7 +76,7 @@ end component.type = function(addr) if allow(addr) then - return kernel._K.component.type(addr) + return rawComponent.type(addr) else return nil, "no such component" end @@ -81,7 +84,7 @@ end component.slot = function(addr) if allow(addr) then - return kernel._K.component.slot(addr) + return rawComponent.slot(addr) else return nil, "no such component" end diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/var/lib/mpt/config.db b/src/main/resources/assets/opencomputers/loot/Plan9k/var/lib/mpt/config.db index 3ecc57b30..1297bda91 100644 --- a/src/main/resources/assets/opencomputers/loot/Plan9k/var/lib/mpt/config.db +++ b/src/main/resources/assets/opencomputers/loot/Plan9k/var/lib/mpt/config.db @@ -1 +1 @@ -{database="/var/lib/mpt/base.db",cacheDir="/var/lib/mpt/cache/",frontend={mpt={api="http://mpt.magik6k.net/api/"}}} \ No newline at end of file +{database="/var/lib/mpt/base.db",frontend={mpt={api="http://mpt.magik6k.net/api/"}},cacheDir="/var/lib/mpt/cache/"} \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/loot/Plan9k/var/lib/mpt/mpt.db b/src/main/resources/assets/opencomputers/loot/Plan9k/var/lib/mpt/mpt.db index d75da8a80..a43080bed 100644 --- a/src/main/resources/assets/opencomputers/loot/Plan9k/var/lib/mpt/mpt.db +++ b/src/main/resources/assets/opencomputers/loot/Plan9k/var/lib/mpt/mpt.db @@ -1 +1 @@ -{installed={plan9k={frontend="MPT",data={name="plan9k",files={},repo="plan9k",dependencies={"plan9k-core","plan9k-network","plan9k-drivers","plan9k-edit","plan9k-data"},checksum="-2d8f4b84ea60b0c9d5846f57e9f1691c"},deps={"plan9k-core","plan9k-network","plan9k-drivers","plan9k-edit","plan9k-data"}},["plan9k-data"]={frontend="MPT",data={name="plan9k-data",files={"/usr/bin/base64.lua","/usr/lib/data.lua","/usr/bin/deflate.lua","/usr/bin/inflate.lua","/usr/bin/md5sum.lua","/usr/bin/sha256sum.lua","/usr/bin/gpg.lua"},repo="plan9k",dependencies={},checksum="480a898a741b2bf424f9e0e86e5072ba"},deps={}},["plan9k-filesystems"]={frontend="MPT",data={name="plan9k-filesystems",files={"/lib/msdosfs.lua","/bin/mount.msdos.lua","/usr/bin/mkdosfs.lua"},repo="plan9k",dependencies={},checksum="-50d8cc1c5928bec760f210185cccfafd"},deps={}},["plan9k-corelibs"]={frontend="MPT",data={name="plan9k-corelibs",files={"/lib/serialization.lua","/lib/term.lua","/lib/text.lua","/lib/shell.lua","/lib/event.lua"},repo="plan9k",dependencies={},checksum="-6d48e158051e4ffa3ab82ed97dffa830"},deps={}},mpt={frontend="MPT",data={name="mpt",files={"/usr/bin/mpt.lua"},repo="mpt",dependencies={},checksum="-4bef26a6a1a0b78056600ce9487fe735"},deps={}},["plan9k-installer"]={frontend="MPT",data={name="plan9k-installer",files={"/bin/install.lua"},repo="plan9k",dependencies={"plan9k","mpt","plan9k-extra"},checksum="-31228542b8cc1190aa9d8be7ea4ff56c"},deps={"plan9k","mpt","plan9k-extra"}},["plan9k-core"]={frontend="MPT",data={name="plan9k-core",files={"/bin/init.lua","/bin/getty.lua","/bin/readkey.lua","/lib/rc.lua","/bin/rc.lua"},repo="plan9k",dependencies={"pipes","plan9k-coreutil","plan9k-shell"},checksum="6950ff30af0231e69b1ae8d0b5b8ad77"},deps={"pipes","plan9k-coreutil","plan9k-shell"}},["plan9k-ssh"]={frontend="MPT",data={name="plan9k-ssh",files={"/etc/rc.d/sshd.lua","/bin/sshd.lua","/usr/sbin/sshsession.lua","/usr/bin/ssh.lua"},repo="plan9k",dependencies={},checksum="-2fc28a9bdd608182c931a126ca8150d"},deps={}},pipes={frontend="MPT",data={name="pipes",files={"/boot/kernel/pipes","/lib/modules/base/05_vfs.lua","/lib/modules/base/20_threading.lua","/lib/modules/base/19_manageg.lua","/lib/modules/base/25_init.lua","/lib/modules/base/15_userspace.lua","/usr/man/pipes","/lib/modules/base/16_buffer.lua","/lib/modules/base/17_io.lua","/lib/modules/base/16_require.lua","/lib/modules/base/18_syscall.lua","/lib/modules/base/21_threadUtil.lua","/lib/modules/base/21_timer.lua","/lib/modules/base/16_component.lua","/lib/modules/base/15_keventd.lua","/lib/modules/base/10_procfs.lua","/lib/modules/base/01_util.lua","/lib/modules/base/10_devfs.lua","/lib/modules/base/18_pty.lua","/lib/modules/base/17_keyboard.lua","/lib/modules/base/06_cowfs.lua","/lib/modules/base/09_rootfs.lua","/lib/modules/base/01_gc.lua","/lib/modules/base/17_ipc.lua","/lib/modules/base/19_cgroups.lua","/lib/modules/base/02_cmd.lua"},repo="plan9k",dependencies={"openloader-init"},checksum="-723a1f6b874a2a7e5ae4bc91e60ecc64"},deps={"openloader-init"}},["plan9k-coreutil"]={frontend="MPT",data={name="plan9k-coreutil",files={"/bin/echo.lua","/bin/wc.lua","/bin/ps.lua","/bin/lua.lua","/bin/kill.lua","/bin/reboot.lua","/bin/sleep.lua","/bin/clear.lua","/bin/components.lua","/bin/hostname.lua","/bin/dmesg.lua","/bin/shutdown.lua","/bin/label.lua","/bin/uptime.lua","/bin/resolution.lua","/bin/watch.lua","/bin/passwd.lua"},repo="plan9k",dependencies={"plan9k-corelibs","plan9k-fsutil"},checksum="-2e3257235e131ffaf5ba1a9fd77ba946"},deps={"plan9k-corelibs","plan9k-fsutil"}},["plan9k-fsutil"]={frontend="MPT",data={name="plan9k-fsutil",files={"/bin/cat.lua","/bin/ln.lua","/bin/ls.lua","/bin/mv.lua","/bin/rm.lua","/bin/tee.lua","/bin/df.lua","/bin/dd.lua","/bin/cp.lua","/bin/touch.lua","/bin/mount.lua","/bin/mount.cow.lua","/bin/mkdir.lua","/bin/pwd.lua","/bin/more.lua","/bin/du.lua"},repo="plan9k",dependencies={"plan9k-corelibs"},checksum="-3e5ba058562df4c95858b2992e90365d"},deps={"plan9k-corelibs"}},["plan9k-extra"]={frontend="MPT",data={name="plan9k-extra",files={"/etc/rc.d/autoupdate.lua"},repo="plan9k",dependencies={"plan9k-ssh","plan9k-containers","plan9k-filesystems","plan9k","mpt"},checksum="42acf5b6b26058654c4ef359a6e19d14"},deps={"plan9k-ssh","plan9k-containers","plan9k-filesystems","plan9k","mpt"}},["plan9k-containers"]={frontend="MPT",data={name="plan9k-containers",files={"/bin/sandbox.lua"},repo="plan9k",dependencies={},checksum="-5ff36b0bde938782f3821bca52931c06"},deps={}},["plan9k-drivers"]={frontend="MPT",data={name="plan9k-drivers",files={"/lib/modules/base/17_tape.lua","/lib/modules/base/17_eeprom.lua","/lib/modules/base/17_nfc.lua","/lib/modules/base/17_chatbox.lua","/lib/modules/base/17_data.lua","/lib/modules/base/17_drive.lua"},repo="plan9k",dependencies={},checksum="-3f839e5e5c38f81bbd03e6a6438ac15f"},deps={}},["openloader-init"]={frontend="MPT",data={name="openloader-init",files={"/init.lua"},repo="disks",dependencies={},checksum="-45e6d7b1e41468c1d335952ee3b89e13"},deps={}},["plan9k-edit"]={frontend="MPT",data={name="plan9k-edit",files={"/bin/edit.lua"},repo="plan9k",dependencies={},checksum="34b1046ac9b7a87a1cdd74f8c03f27ea"},deps={}},["plan9k-network"]={frontend="MPT",data={name="plan9k-network",files={"/lib/internet.lua","/bin/pastebin.lua","/bin/wget.lua","/lib/modules/base/17_network.lua","/lib/modules/base/19_libnetwork.lua","/bin/arp.lua","/bin/ifconfig.lua","/bin/ping.lua","/bin/route.lua","/lib/modules/network/loopback.lua","/lib/modules/network/modem.lua","/usr/bin/nc.lua","/lib/modules/network/tunnel.lua"},repo="plan9k",dependencies={},checksum="-3310268a428bf449c821cbc8ac140ca5"},deps={}},["plan9k-shell"]={frontend="MPT",data={name="plan9k-shell",files={"/bin/sh.lua"},repo="plan9k",dependencies={},checksum="-7a6e50038841f4529feab7ebf0971fcb"},deps={}}},oppm={packages={},repos={}}} \ No newline at end of file +{installed={["plan9k-drivers"]={deps={},frontend="MPT",data={checksum="-3f839e5e5c38f81bbd03e6a6438ac15f",files={"/lib/modules/base/17_tape.lua","/lib/modules/base/17_eeprom.lua","/lib/modules/base/17_nfc.lua","/lib/modules/base/17_chatbox.lua","/lib/modules/base/17_data.lua","/lib/modules/base/17_drive.lua"},name="plan9k-drivers",repo="plan9k",dependencies={}}},["plan9k-edit"]={deps={},frontend="MPT",data={checksum="34b1046ac9b7a87a1cdd74f8c03f27ea",files={"/bin/edit.lua"},name="plan9k-edit",repo="plan9k",dependencies={}}},["openloader-init"]={deps={},frontend="MPT",data={checksum="-45e6d7b1e41468c1d335952ee3b89e13",files={"/init.lua"},name="openloader-init",repo="disks",dependencies={}}},["plan9k-corelibs"]={deps={},frontend="MPT",data={checksum="-6d48e158051e4ffa3ab82ed97dffa830",files={"/lib/serialization.lua","/lib/term.lua","/lib/text.lua","/lib/shell.lua","/lib/event.lua"},name="plan9k-corelibs",repo="plan9k",dependencies={}}},plan9k={deps={"plan9k-core","plan9k-network","plan9k-drivers","plan9k-edit","plan9k-data"},frontend="MPT",data={checksum="-2d8f4b84ea60b0c9d5846f57e9f1691c",files={},name="plan9k",repo="plan9k",dependencies={"plan9k-core","plan9k-network","plan9k-drivers","plan9k-edit","plan9k-data"}}},pipes={deps={"openloader-init"},frontend="MPT",data={checksum="7cd396784439d292023d2374b0d4ca55",repo="plan9k",name="pipes",files={"/boot/kernel/pipes","/lib/modules/base/05_vfs.lua","/lib/modules/base/20_threading.lua","/lib/modules/base/19_manageg.lua","/lib/modules/base/25_init.lua","/lib/modules/base/15_userspace.lua","/usr/man/pipes","/lib/modules/base/16_buffer.lua","/lib/modules/base/17_io.lua","/lib/modules/base/16_require.lua","/lib/modules/base/18_syscall.lua","/lib/modules/base/21_threadUtil.lua","/lib/modules/base/21_timer.lua","/lib/modules/base/16_component.lua","/lib/modules/base/15_keventd.lua","/lib/modules/base/10_procfs.lua","/lib/modules/base/01_util.lua","/lib/modules/base/10_devfs.lua","/lib/modules/base/18_pty.lua","/lib/modules/base/17_keyboard.lua","/lib/modules/base/06_cowfs.lua","/lib/modules/base/09_rootfs.lua","/lib/modules/base/01_gc.lua","/lib/modules/base/17_ipc.lua","/lib/modules/base/19_cgroups.lua","/lib/modules/base/02_cmd.lua"},dependencies={"openloader-init"}}},["plan9k-data"]={deps={},frontend="MPT",data={checksum="480a898a741b2bf424f9e0e86e5072ba",files={"/usr/bin/base64.lua","/usr/lib/data.lua","/usr/bin/deflate.lua","/usr/bin/inflate.lua","/usr/bin/md5sum.lua","/usr/bin/sha256sum.lua","/usr/bin/gpg.lua"},name="plan9k-data",repo="plan9k",dependencies={}}},["plan9k-extra"]={deps={"plan9k-ssh","plan9k-containers","plan9k-filesystems","plan9k","mpt"},frontend="MPT",data={checksum="42acf5b6b26058654c4ef359a6e19d14",files={"/etc/rc.d/autoupdate.lua"},name="plan9k-extra",repo="plan9k",dependencies={"plan9k-ssh","plan9k-containers","plan9k-filesystems","plan9k","mpt"}}},["plan9k-fsutil"]={deps={"plan9k-corelibs"},frontend="MPT",data={checksum="-3e5ba058562df4c95858b2992e90365d",files={"/bin/cat.lua","/bin/ln.lua","/bin/ls.lua","/bin/mv.lua","/bin/rm.lua","/bin/tee.lua","/bin/df.lua","/bin/dd.lua","/bin/cp.lua","/bin/touch.lua","/bin/mount.lua","/bin/mount.cow.lua","/bin/mkdir.lua","/bin/pwd.lua","/bin/more.lua","/bin/du.lua"},name="plan9k-fsutil",repo="plan9k",dependencies={"plan9k-corelibs"}}},["plan9k-core"]={deps={"pipes","plan9k-coreutil","plan9k-shell"},frontend="MPT",data={checksum="6950ff30af0231e69b1ae8d0b5b8ad77",files={"/bin/init.lua","/bin/getty.lua","/bin/readkey.lua","/lib/rc.lua","/bin/rc.lua"},name="plan9k-core",repo="plan9k",dependencies={"pipes","plan9k-coreutil","plan9k-shell"}}},["plan9k-ssh"]={deps={},frontend="MPT",data={checksum="-2fc28a9bdd608182c931a126ca8150d",files={"/etc/rc.d/sshd.lua","/bin/sshd.lua","/usr/sbin/sshsession.lua","/usr/bin/ssh.lua"},name="plan9k-ssh",repo="plan9k",dependencies={}}},["plan9k-network"]={deps={},frontend="MPT",data={checksum="-3310268a428bf449c821cbc8ac140ca5",files={"/lib/internet.lua","/bin/pastebin.lua","/bin/wget.lua","/lib/modules/base/17_network.lua","/lib/modules/base/19_libnetwork.lua","/bin/arp.lua","/bin/ifconfig.lua","/bin/ping.lua","/bin/route.lua","/lib/modules/network/loopback.lua","/lib/modules/network/modem.lua","/usr/bin/nc.lua","/lib/modules/network/tunnel.lua"},name="plan9k-network",repo="plan9k",dependencies={}}},["plan9k-installer"]={deps={"plan9k","mpt","plan9k-extra"},frontend="MPT",data={checksum="-31228542b8cc1190aa9d8be7ea4ff56c",files={"/bin/install.lua"},name="plan9k-installer",repo="plan9k",dependencies={"plan9k","mpt","plan9k-extra"}}},["plan9k-coreutil"]={deps={"plan9k-corelibs","plan9k-fsutil"},frontend="MPT",data={checksum="-2e3257235e131ffaf5ba1a9fd77ba946",files={"/bin/echo.lua","/bin/wc.lua","/bin/ps.lua","/bin/lua.lua","/bin/kill.lua","/bin/reboot.lua","/bin/sleep.lua","/bin/clear.lua","/bin/components.lua","/bin/hostname.lua","/bin/dmesg.lua","/bin/shutdown.lua","/bin/label.lua","/bin/uptime.lua","/bin/resolution.lua","/bin/watch.lua","/bin/passwd.lua"},name="plan9k-coreutil",repo="plan9k",dependencies={"plan9k-corelibs","plan9k-fsutil"}}},["plan9k-shell"]={deps={},frontend="MPT",data={checksum="-7a6e50038841f4529feab7ebf0971fcb",files={"/bin/sh.lua"},name="plan9k-shell",repo="plan9k",dependencies={}}},mpt={deps={},frontend="MPT",data={checksum="-4bef26a6a1a0b78056600ce9487fe735",files={"/usr/bin/mpt.lua"},name="mpt",repo="mpt",dependencies={}}},["plan9k-filesystems"]={deps={},frontend="MPT",data={checksum="-50d8cc1c5928bec760f210185cccfafd",files={"/lib/msdosfs.lua","/bin/mount.msdos.lua","/usr/bin/mkdosfs.lua"},name="plan9k-filesystems",repo="plan9k",dependencies={}}},["plan9k-containers"]={deps={},frontend="MPT",data={checksum="-5ff36b0bde938782f3821bca52931c06",files={"/bin/sandbox.lua"},name="plan9k-containers",repo="plan9k",dependencies={}}}},oppm={packages={},repos={}}} \ No newline at end of file