From a20585cc330afde2273b3cb9ca0ed4151b43601b Mon Sep 17 00:00:00 2001
From: MggMuggins <mggmugginsmc@gmail.com>
Date: Sat, 18 Aug 2018 13:46:07 -0500
Subject: [PATCH] Update installer; Permissions changes

"Permissions changes" entail removing the chown/chmod calls in
mk/filesystem.mk since that has all been implemented in the correct
locations. I also moved /tmp creation from mk/filesystem.mk to
filesystem.toml, since the installer now supports creating directories
and handling permissions
---
 filesystem.toml  | 10 ++++++++--
 installer        |  2 +-
 mk/filesystem.mk | 15 ---------------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/filesystem.toml b/filesystem.toml
index 5939596..41d1356 100644
--- a/filesystem.toml
+++ b/filesystem.toml
@@ -100,8 +100,7 @@ zerod = {}
 
 # User settings
 [users.root]
-# Password is set to "password"
-password = "$argon2i$m=4096,t=10,p=1$Tnc4UVV0N00$ML9LIOujd3nmAfkAwEcSTMPqakWUF0OUiLWrIy0nGLk"
+password = "password"
 uid = 0
 gid = 0
 name = "root"
@@ -214,3 +213,10 @@ Welcome to Redox OS!
 path = "/usr/bin"
 data = "/bin"
 symlink = true
+
+[[files]]
+path = "/tmp"
+data = ""
+directory= true
+# 0o1777
+mode = 1023
diff --git a/installer b/installer
index 999db45..33fa0af 160000
--- a/installer
+++ b/installer
@@ -1 +1 @@
-Subproject commit 999db45b0ebed633cc3ef1e12d16647644cd5b52
+Subproject commit 33fa0af5214decdda7cc7ac39407ad18d727583b
diff --git a/mk/filesystem.mk b/mk/filesystem.mk
index 8f19f17..e31405d 100644
--- a/mk/filesystem.mk
+++ b/mk/filesystem.mk
@@ -10,21 +10,6 @@ build/filesystem.bin: filesystem.toml build/bootloader build/kernel
 	pgrep redoxfs
 	cp filesystem.toml build/bootloader build/kernel build/filesystem/
 	cargo run --manifest-path installer/Cargo.toml --release -- $(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
-	chmod -R u+w build/filesystem
-	chmod -R og-w build/filesystem
-	chmod -R 755 build/filesystem/bin
-	chmod -R u+rwX build/filesystem/root
-	chmod -R og-rwx build/filesystem/root
-	chmod -R u+rwX build/filesystem/home/user
-	chmod -R og-rwx build/filesystem/home/user
-	chmod +s build/filesystem/bin/passwd
-	chmod +s build/filesystem/bin/su
-	chmod +s build/filesystem/bin/sudo
-	mkdir build/filesystem/tmp
-	chmod 1777 build/filesystem/tmp
 	sync
 	-$(FUMOUNT) build/filesystem/ || true
 	rm -rf build/filesystem/