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

Merge branch 'swap_usrmerge' into 'master'

Browse source 
Make /{bin,lib,share,include} a symlink to /usr/{bin,lib,share,include}

See merge request redox-os/redox!1400
This commit is contained in:
Jeremy Soller 2024-01-06 17:12:29 +00:00
parent d7e3bc0b87 21561d1642
commit 161788988c
1 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
config/base.toml
View file

@ -36,24 +36,54 @@ path = "/etc/redox-release"
data = "0.8.0" data = "0.8.0"
## Symlinks for usrmerge ## Symlinks for usrmerge
[[files]]
path = "/usr"
data = ""
directory = true
mode = 0o755
[[files]] [[files]]
path = "/usr/bin" path = "/usr/bin"
data = "../bin" data = ""
directory = true
mode = 0o755
[[files]]
path = "/bin"
data = "usr/bin"
symlink = true symlink = true
[[files]] [[files]]
path = "/usr/include" path = "/usr/include"
data = "../include" data = ""
directory = true
mode = 0o755
[[files]]
path = "/include"
data = "usr/include"
symlink = true symlink = true
[[files]] [[files]]
path = "/usr/lib" path = "/usr/lib"
data = "../lib" data = ""
directory = true
mode = 0o755
[[files]]
path = "/lib"
data = "usr/lib"
symlink = true symlink = true
[[files]] [[files]]
path = "/usr/share" path = "/usr/share"
data = "../share" data = ""
directory = true
mode = 0o755
[[files]]
path = "/share"
data = "usr/share"
symlink = true symlink = true
## /tmp directory with special mode ## /tmp directory with special mode
@ -61,8 +91,7 @@ symlink = true
path = "/tmp" path = "/tmp"
data = "" data = ""
directory = true directory = true
# 0o1777 mode = 0o1777
mode = 1023
## Device file symlinks ## Device file symlinks
[[files]] [[files]]