vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'genodeftest-fix-fs-permissions'

Browse source
This commit is contained in:
Jeremy Soller 2016-11-07 08:39:56 -07:00
parent 083d5030c9 91f4dd81f8
commit 055203c7fe
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Makefile
View file

@ -55,6 +55,7 @@ clean:
cargo clean --manifest-path schemes/redoxfs/Cargo.toml cargo clean --manifest-path schemes/redoxfs/Cargo.toml
cargo clean --manifest-path schemes/tcpd/Cargo.toml cargo clean --manifest-path schemes/tcpd/Cargo.toml
cargo clean --manifest-path schemes/udpd/Cargo.toml cargo clean --manifest-path schemes/udpd/Cargo.toml
-$(FUMOUNT) $(BUILD)/filesystem/
rm -rf initfs/bin rm -rf initfs/bin
rm -rf filesystem/bin rm -rf filesystem/bin
rm -rf build rm -rf build
@ -476,6 +477,7 @@ $(BUILD)/filesystem.bin: \
filesystem/bin/sh \ filesystem/bin/sh \
filesystem/bin/smith \ filesystem/bin/smith \
filesystem/bin/tar filesystem/bin/tar
-$(FUMOUNT) $(BUILD)/filesystem/
rm -rf $@ $(BUILD)/filesystem/ rm -rf $@ $(BUILD)/filesystem/
echo exit | cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-utility $@ 256 echo exit | cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-utility $@ 256
mkdir -p $(BUILD)/filesystem/ mkdir -p $(BUILD)/filesystem/
@ -484,14 +486,19 @@ $(BUILD)/filesystem.bin: \
sleep 2 sleep 2
pgrep redoxfs-fuse pgrep redoxfs-fuse
cp -RL filesystem/* $(BUILD)/filesystem/ cp -RL filesystem/* $(BUILD)/filesystem/
chown -R 0:0 $(BUILD)/filesystem/ chmod -R uog+rX $(BUILD)/filesystem
chown -R 1000:1000 $(BUILD)/filesystem/home/user/ chmod -R uog-w $(BUILD)/filesystem
chmod 700 $(BUILD)/filesystem/root/ chmod -R 555 $(BUILD)/filesystem/bin/
chmod 700 $(BUILD)/filesystem/home/user/ 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/su chmod +s $(BUILD)/filesystem/bin/su
chmod +s $(BUILD)/filesystem/bin/sudo chmod +s $(BUILD)/filesystem/bin/sudo
mkdir $(BUILD)/filesystem/tmp mkdir $(BUILD)/filesystem/tmp
chmod 1777 $(BUILD)/filesystem/tmp chmod 1777 $(BUILD)/filesystem/tmp
chown -R 0:0 $(BUILD)/filesystem
chown -R 1000:1000 $(BUILD)/filesystem/home/user
sync sync
-$(FUMOUNT) $(BUILD)/filesystem/ -$(FUMOUNT) $(BUILD)/filesystem/
rm -rf $(BUILD)/filesystem/ rm -rf $(BUILD)/filesystem/