Merge branch 'mggmuggins/permissions' into 'master'

Update installer; Permissions changes

See merge request redox-os/redox!1195
This commit is contained in:
Ian Douglas Scott 2018-08-24 17:05:13 +00:00
commit 670cd571e3
3 changed files with 9 additions and 18 deletions

View file

@ -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

@ -1 +1 @@
Subproject commit 999db45b0ebed633cc3ef1e12d16647644cd5b52
Subproject commit 33fa0af5214decdda7cc7ac39407ad18d727583b

View file

@ -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/