From 913687d1fba64bf3356dce0760b8e6074abc0b4e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 17 Jun 2017 13:23:12 -0600 Subject: [PATCH] Move kernel into filesystem --- bootloader | 2 +- mk/filesystem.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bootloader b/bootloader index 2ad0410..7ba99fc 160000 --- a/bootloader +++ b/bootloader @@ -1 +1 @@ -Subproject commit 2ad0410ebcb1d468cdb00f7f28640109af6b3ddb +Subproject commit 7ba99fce952558b0934ec38c5ffd2b21741426d4 diff --git a/mk/filesystem.mk b/mk/filesystem.mk index 519975b..b081288 100644 --- a/mk/filesystem.mk +++ b/mk/filesystem.mk @@ -1,4 +1,4 @@ -build/filesystem.bin: filesystem.toml +build/filesystem.bin: filesystem.toml build/kernel -$(FUMOUNT) build/filesystem/ || true rm -rf $@ $@.partial build/filesystem/ 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/ sleep 2 pgrep redoxfs + cp build/kernel build/filesystem/kernel cargo run --manifest-path installer/Cargo.toml -- --cookbook=cookbook $< chown -R 0:0 build/filesystem chown -R 1000:1000 build/filesystem/home/user