Fix compilation of filesystem

Makefile

@@ -156,35 +156,11 @@ initfs/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib
 
 initfs_drivers: \
 	initfs/bin/ahcid \
-	initfs/bin/pcid \
-	initfs/bin/ps2d \
-	initfs/bin/vesad
+	initfs/bin/pcid
 
 initfs_schemes: \
-	initfs/bin/example \
 	initfs/bin/redoxfs
 
-filesystem/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib
-	mkdir -p filesystem/bin
-	$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
-	strip $@
-	rm $@.d
-
-filesystem/bin/%: programs/coreutils/Cargo.toml programs/coreutils/src/bin/%.rs $(BUILD)/libstd.rlib
-	mkdir -p filesystem/bin
-	$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
-	strip $@
-	rm $@.d
-
-coreutils: \
-	filesystem/bin/cat \
-	filesystem/bin/echo \
-	filesystem/bin/env \
-	filesystem/bin/ls \
-	filesystem/bin/printenv \
-	filesystem/bin/pwd \
-	filesystem/bin/realpath
-
 $(BUILD)/initfs.rs: \
 		initfs/bin/init \
 		initfs_drivers \
@@ -202,8 +178,50 @@ $(BUILD)/initfs.rs: \
 	echo '    files' >> $@
 	echo '}' >> $@
 
+filesystem/bin/%: drivers/%/Cargo.toml drivers/%/src/** $(BUILD)/libstd.rlib
+	mkdir -p filesystem/bin
+	$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
+	strip $@
+	rm $@.d
+
+filesystem/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib
+	mkdir -p filesystem/bin
+	$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
+	strip $@
+	rm $@.d
+
+filesystem/bin/%: programs/coreutils/Cargo.toml programs/coreutils/src/bin/%.rs $(BUILD)/libstd.rlib
+	mkdir -p filesystem/bin
+	$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
+	strip $@
+	rm $@.d
+
+filesystem/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib
+	mkdir -p filesystem/bin
+	$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
+	strip $@
+	rm $@.d
+
+drivers: \
+	initfs/bin/ps2d \
+	initfs/bin/vesad
+
+coreutils: \
+	filesystem/bin/cat \
+	filesystem/bin/echo \
+	filesystem/bin/env \
+	filesystem/bin/ls \
+	filesystem/bin/printenv \
+	filesystem/bin/pwd \
+	filesystem/bin/realpath
+
+schemes: \
+	filesystem/bin/example
+
 $(BUILD)/filesystem.bin: \
+		drivers \
 		coreutils \
+		schemes \
 		filesystem/bin/ion \
 		filesystem/bin/login
 	rm -rf $@ $(BUILD)/filesystem/
@@ -211,7 +229,18 @@ $(BUILD)/filesystem.bin: \
 	mkdir -p $(BUILD)/filesystem/
 	cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-fuse $@ $(BUILD)/filesystem/ &
 	sleep 2
-	-cp -RL initfs/* $(BUILD)/filesystem/
+	-cp -RL filesystem/* $(BUILD)/filesystem/
 	sync
 	-fusermount -u $(BUILD)/filesystem/
 	rm -rf $(BUILD)/filesystem/
+
+mount: FORCE
+	mkdir -p $(KBUILD)/harddrive/
+	cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-fuse $(KBUILD)/harddrive.bin $(KBUILD)/harddrive/ &
+	sleep 2
+
+unmount: FORCE
+	sync
+	-fusermount -u $(KBUILD)/harddrive/
+	rm -rf $(KBUILD)/harddrive/
+

initfs/etc/init.rc

@@ -1,5 +1,5 @@
-initfs:bin/vesad
-initfs:bin/ps2d
 initfs:bin/pcid initfs:etc/pcid.toml
 initfs:bin/redoxfs disk:0
+file:bin/vesad
+file:bin/ps2d
 file:bin/login display: file:bin/ion

schemes/redoxfs

@@ -1 +1 @@
-Subproject commit 9bd5d69776e2df6a831e775631549aafcc5597af
+Subproject commit 9c16bca2a56fea005c0bc16d9411adc590e0bbf8