diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | initrd/1.txt | 1 | ||||
| -rw-r--r-- | initrd/2.txt | 1 | ||||
| -rw-r--r-- | initrd/bin/sh/catall | 19 | ||||
| -rw-r--r-- | initrd/dir/3.txt | 1 | ||||
| -rw-r--r-- | initrd/dir/4 | 0 | ||||
| -rw-r--r-- | initrd/dir/5 | 0 | ||||
| -rw-r--r-- | sysroot/Users/dzwdz/private/secrets.txt (renamed from initrd/Users/dzwdz/private/secrets.txt) | 0 | ||||
| -rw-r--r-- | sysroot/Users/dzwdz/public/stuff.txt (renamed from initrd/Users/dzwdz/public/stuff.txt) | 0 | ||||
| -rw-r--r-- | sysroot/bin/sh/fib | 10 | ||||
| -rw-r--r-- | sysroot/bin/sh/halt (renamed from initrd/bin/sh/halt) | 0 | ||||
| -rw-r--r-- | sysroot/bin/sh/mkuser (renamed from initrd/bin/sh/mkuser) | 0 | ||||
| -rw-r--r-- | sysroot/usr/arp.ether (renamed from initrd/arp.ether) | bin | 64 -> 64 bytes | |||
| -rw-r--r-- | sysroot/usr/long.txt (renamed from initrd/long.txt) | 0 |
14 files changed, 12 insertions, 24 deletions
@@ -118,14 +118,14 @@ $(foreach bin,$(USERBINS),$(eval $(call userbin_template,$(bin)))) out/obj/user/app/ext2fs/ext2/example.c.o: @touch $@ -out/initrd/%: initrd/% +out/initrd/%: sysroot/% @mkdir -p $(@D) @cp $< $@ out/initrd/font.psf: curl -L https://github.com/legionus/kbd/raw/master/data/consolefonts/default8x16.psfu > $@ -out/initrd.tar: $(patsubst %,out/%,$(shell find initrd/ -type f)) \ +out/initrd.tar: $(patsubst sysroot/%,out/initrd/%,$(shell find sysroot/ -type f)) \ $(patsubst %,out/initrd/bin/amd64/%,$(USERBINS)) \ $(shell find out/initrd/) \ out/initrd/font.psf diff --git a/initrd/1.txt b/initrd/1.txt deleted file mode 100644 index 8e08ed0..0000000 --- a/initrd/1.txt +++ /dev/null @@ -1 +0,0 @@ -i am /1.txt diff --git a/initrd/2.txt b/initrd/2.txt deleted file mode 100644 index c214a20..0000000 --- a/initrd/2.txt +++ /dev/null @@ -1 +0,0 @@ -i am /2.txt diff --git a/initrd/bin/sh/catall b/initrd/bin/sh/catall deleted file mode 100644 index a1c8c76..0000000 --- a/initrd/bin/sh/catall +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/shell -# equalivent to the old "catall" builtin, meant to demo shadowing -# TODO shadow here -echo /init/fake.txt: -cat /init/fake.txt -echo - -echo /init/1.txt: -cat /init/1.txt -echo - -echo /init/2.txt: -cat /init/2.txt -echo - -echo /init/dir/3.txt: -cat /init/dir/3.txt -echo - diff --git a/initrd/dir/3.txt b/initrd/dir/3.txt deleted file mode 100644 index 6ab8da4..0000000 --- a/initrd/dir/3.txt +++ /dev/null @@ -1 +0,0 @@ -i am /dir/3.txt diff --git a/initrd/dir/4 b/initrd/dir/4 deleted file mode 100644 index e69de29..0000000 --- a/initrd/dir/4 +++ /dev/null diff --git a/initrd/dir/5 b/initrd/dir/5 deleted file mode 100644 index e69de29..0000000 --- a/initrd/dir/5 +++ /dev/null diff --git a/initrd/Users/dzwdz/private/secrets.txt b/sysroot/Users/dzwdz/private/secrets.txt index 7f1bcbc..7f1bcbc 100644 --- a/initrd/Users/dzwdz/private/secrets.txt +++ b/sysroot/Users/dzwdz/private/secrets.txt diff --git a/initrd/Users/dzwdz/public/stuff.txt b/sysroot/Users/dzwdz/public/stuff.txt index b864fc2..b864fc2 100644 --- a/initrd/Users/dzwdz/public/stuff.txt +++ b/sysroot/Users/dzwdz/public/stuff.txt diff --git a/sysroot/bin/sh/fib b/sysroot/bin/sh/fib new file mode 100644 index 0000000..6d84b1b --- /dev/null +++ b/sysroot/bin/sh/fib @@ -0,0 +1,10 @@ +#!/bin/lua + +function fib(n) + if n <= 1 then return 1 end + return fib(n-1) + fib(n-2) +end + +for i=1,13 do + print("fib("..i..")\t= " .. fib(i)) +end diff --git a/initrd/bin/sh/halt b/sysroot/bin/sh/halt index 563aded..563aded 100644 --- a/initrd/bin/sh/halt +++ b/sysroot/bin/sh/halt diff --git a/initrd/bin/sh/mkuser b/sysroot/bin/sh/mkuser index a1544c6..a1544c6 100644 --- a/initrd/bin/sh/mkuser +++ b/sysroot/bin/sh/mkuser diff --git a/initrd/arp.ether b/sysroot/usr/arp.ether Binary files differindex c8fbec7..c8fbec7 100644 --- a/initrd/arp.ether +++ b/sysroot/usr/arp.ether diff --git a/initrd/long.txt b/sysroot/usr/long.txt index ed0b66a..ed0b66a 100644 --- a/initrd/long.txt +++ b/sysroot/usr/long.txt |