kernel

@@ -1 +1 @@
-Subproject commit 80376a95dc784966260992910d7e789390f58b65
+Subproject commit 7e2e7b8c21b41cd2686511b0ba01ae3aeb6eb102

mk/config.mk

@@ -9,8 +9,6 @@ INSTALLER_FLAGS?=--cookbook=cookbook
 PREFIX_BINARY?=1
 ## Filesystem size in MB (256 is the default)
 FILESYSTEM_SIZE?=256
-## Flags to pass to redoxfs-mkfs. Add --encrypt to set up disk encryption
-REDOXFS_MKFS_FLAGS?=
 
 # Per host variables
 UNAME := $(shell uname)

mk/filesystem.mk

@@ -1,19 +1,17 @@
-build/filesystem.bin: filesystem.toml build/kernel prefix
+build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix
 	cargo build --manifest-path cookbook/Cargo.toml --release
 	cargo build --manifest-path installer/Cargo.toml --release
 	cargo build --manifest-path redoxfs/Cargo.toml --release
 	-$(FUMOUNT) build/filesystem/ || true
 	rm -rf $@  $@.partial build/filesystem/
 	dd if=/dev/zero of=$@.partial bs=1048576 count="$(FILESYSTEM_SIZE)"
-	cargo run --release \
-		--manifest-path redoxfs/Cargo.toml \
-		--bin redoxfs-mkfs \
-		-- $(REDOXFS_MKFS_FLAGS) $@.partial
+	cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs-mkfs $@.partial
 	mkdir -p build/filesystem/
 	redoxfs/target/release/redoxfs $@.partial build/filesystem/
 	sleep 2
 	pgrep redoxfs
 	cp $< build/filesystem/filesystem.toml
+	cp build/bootloader.bin build/filesystem/bootloader
 	cp build/kernel build/filesystem/kernel
 	cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include
 	cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib