Merge branch 'swap_usrmerge' into 'master'

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
commit 161788988c

View file

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