From edf3ac0582843e6568718f765242d353f1cf3a48 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 26 Sep 2017 20:53:08 -0600
Subject: [PATCH] Update installer

---
 Makefile         | 12 +++++++-----
 filesystem.toml  |  1 -
 initfs.toml      |  1 -
 installer        |  2 +-
 mk/filesystem.mk |  2 +-
 mk/initfs.mk     |  3 ++-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 1ccb277..661575e 100644
--- a/Makefile
+++ b/Makefile
@@ -25,16 +25,18 @@ pull:
 	make update
 
 update:
-	cd cookbook; \
-	./update.sh "$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages ../initfs.toml ../filesystem.toml)"
+	cd cookbook && ./update.sh \
+		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../initfs.toml)" \
+		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../filesystem.toml)"
 	cargo update --manifest-path cookbook/pkgutils/Cargo.toml
 	cargo update --manifest-path installer/Cargo.toml
 	cargo update --manifest-path kernel/Cargo.toml
 	cargo update --manifest-path redoxfs/Cargo.toml
 
 fetch:
-	cd cookbook; \
-	./fetch.sh "$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages ../initfs.toml ../filesystem.toml)"
+	cd cookbook && ./fetch.sh \
+		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../initfs.toml)" \
+		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../filesystem.toml)"
 
 # Emulation recipes
 include mk/qemu.mk
@@ -53,7 +55,7 @@ include mk/disk.mk
 
 # Travis target
 travis: FORCE
-	INSTALLER_FLAGS= make build/harddrive.bin.gz build/livedisk.iso
+	make INSTALLER_FLAGS= build/harddrive.bin.gz build/livedisk.iso
 	rm -rf build/travis
 	mkdir build/travis
 	mv build/harddrive.bin.gz build/travis/redox_$(TRAVIS_TAG).bin.gz
diff --git a/filesystem.toml b/filesystem.toml
index a130a4d..5175aa5 100644
--- a/filesystem.toml
+++ b/filesystem.toml
@@ -4,7 +4,6 @@
 [general]
 # Do not prompt if settings are not defined
 prompt = false
-sysroot = "build/filesystem"
 
 # Package settings
 [packages]
diff --git a/initfs.toml b/initfs.toml
index c584aed..0609ebb 100644
--- a/initfs.toml
+++ b/initfs.toml
@@ -4,7 +4,6 @@
 [general]
 # Do not prompt if settings are not defined
 prompt = false
-sysroot = "build/initfs"
 
 # Package settings
 [packages]
diff --git a/installer b/installer
index a7b16dc..a82a577 160000
--- a/installer
+++ b/installer
@@ -1 +1 @@
-Subproject commit a7b16dcb9712aa39de91ae05ffa005e439a91ed1
+Subproject commit a82a5771803fa14666343568e415999dd51887c7
diff --git a/mk/filesystem.mk b/mk/filesystem.mk
index 0bf8bbb..45e7a99 100644
--- a/mk/filesystem.mk
+++ b/mk/filesystem.mk
@@ -9,7 +9,7 @@ build/filesystem.bin: filesystem.toml build/kernel
 	sleep 2
 	pgrep redoxfs
 	cp build/kernel build/filesystem/kernel
-	cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) $<
+	cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/filesystem/
 	chown -R 0:0 build/filesystem
 	chown -R 1000:1000 build/filesystem/home/user
 	chmod -R uog+rX build/filesystem
diff --git a/mk/initfs.mk b/mk/initfs.mk
index dc25325..1fd6118 100644
--- a/mk/initfs.mk
+++ b/mk/initfs.mk
@@ -1,5 +1,6 @@
 build/initfs.tag: initfs.toml
 	cd kernel && xargo clean
 	rm -rf build/initfs
-	cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) $<
+	mkdir -p build/initfs
+	cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/initfs/
 	touch $@