From 21561d16429e346524a506668c988abf581454c8 Mon Sep 17 00:00:00 2001
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
Date: Sat, 6 Jan 2024 16:40:16 +0100
Subject: [PATCH] Make /{bin,lib,share,include} a symlink to
 /usr/{bin,lib,share,include}

This matches the directory layout of modern Linux systems.
---
 config/base.toml | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/config/base.toml b/config/base.toml
index cd12efb..8917741 100644
--- a/config/base.toml
+++ b/config/base.toml
@@ -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]]