From 57427191e2cf0f08724b74fba3a35aa41ceda40d Mon Sep 17 00:00:00 2001 From: dzwdz Date: Sat, 13 Aug 2022 16:21:02 +0200 Subject: user: plan9-style /bin/ union --- src/user/app/init/init.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/user/app') diff --git a/src/user/app/init/init.c b/src/user/app/init/init.c index c788cb6..2ae8048 100644 --- a/src/user/app/init/init.c +++ b/src/user/app/init/init.c @@ -30,7 +30,13 @@ int main(void) { printf("in init (stage 2), main at 0x%x\n", &main); MOUNT_AT("/keyboard") { ps2_drv(); } - MOUNT_AT("/bin/") { fs_passthru("/init/bin"); } + MOUNT_AT("/bin/") { + fs_union((const char*[]){ + "/init/bin/amd64/", + "/init/bin/sh/", + NULL + }); + } MOUNT_AT("/tmp/") { const char *argv[] = {"/bin/tmpfs", NULL}; execv(argv[0], (void*)argv); -- cgit v1.2.3