vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Move kernel into filesystem

Browse source
This commit is contained in:
Jeremy Soller 2017-06-17 13:23:12 -06:00
parent 56504fc8b1
commit 913687d1fb
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootloader

@ -1 +1 @@
Subproject commit 2ad0410ebcb1d468cdb00f7f28640109af6b3ddb Subproject commit 7ba99fce952558b0934ec38c5ffd2b21741426d4

3
mk/filesystem.mk
View file

@ -1,4 +1,4 @@
build/filesystem.bin: filesystem.toml build/filesystem.bin: filesystem.toml build/kernel
-$(FUMOUNT) build/filesystem/ || true -$(FUMOUNT) build/filesystem/ || true
rm -rf $@ $@.partial build/filesystem/ rm -rf $@ $@.partial build/filesystem/
dd if=/dev/zero of=$@.partial bs=1048576 count=1024 dd if=/dev/zero of=$@.partial bs=1048576 count=1024
@ -8,6 +8,7 @@ build/filesystem.bin: filesystem.toml
cargo run --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs -- $@.partial build/filesystem/ cargo run --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs -- $@.partial build/filesystem/
sleep 2 sleep 2
pgrep redoxfs pgrep redoxfs
cp build/kernel build/filesystem/kernel
cargo run --manifest-path installer/Cargo.toml -- --cookbook=cookbook $< cargo run --manifest-path installer/Cargo.toml -- --cookbook=cookbook $<
chown -R 0:0 build/filesystem chown -R 0:0 build/filesystem
chown -R 1000:1000 build/filesystem/home/user chown -R 1000:1000 build/filesystem/home/user