summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-03-15 21:36:24 +0000
committerJavier Jardón <jjardon@gnome.org>2016-08-21 20:09:16 +0100
commit9fafca436000bb57ddd5c498f8a75ea7b274f6c5 (patch)
tree7d3af36dbe0c80256f48aa43b1f6a7d353e73ee8
parent70dce6fc5402de25e7beae4744997ca7d6dc5255 (diff)
downloadfhs-dirs-9fafca436000bb57ddd5c498f8a75ea7b274f6c5.tar.gz
Implement /usr mergebaserock/usr_merge
Do not create /bin, /sbin, /usr/sbin and /lib Create symlinks /bin -> /usr/bin /sbin -> /usr/bin /usr/sbin -> /usr/bin /lib -> /usr/lib More info here: https://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/
-rwxr-xr-xcreate-fhs-dirs8
1 files changed, 4 insertions, 4 deletions
diff --git a/create-fhs-dirs b/create-fhs-dirs
index 96a4a78..5e7521a 100755
--- a/create-fhs-dirs
+++ b/create-fhs-dirs
@@ -32,20 +32,17 @@ group=root
perms=0755
dirs="
-bin
boot
dev
etc
etc/network
home
-lib
media
mnt
opt
proc
root
run
-sbin
srv
sys
tmp
@@ -58,7 +55,6 @@ usr/local/bin
usr/local/lib
usr/local/share
usr/local/sbin
-usr/sbin
usr/share
usr/share/doc
usr/share/info
@@ -91,6 +87,10 @@ while read link name; do
ln -s "$link" "$target/$name"
done <<EOF
/proc/mounts /etc/mtab
+/usr/bin /bin
+/usr/bin /sbin
+/usr/bin /usr/sbin
+/usr/lib /lib
EOF
# Fix permissions and ownerships for some special cases.