From 75d3accad3b9c44a2f833cf24797c455e03d950d Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Thu, 15 Feb 2018 17:50:47 +0100
Subject: [PATCH] fhs: Create directories and symlinks according to latest FHS

Create `/usr/libexec`, and make `/var/run` and `/var/lock` symbolic
links to `/run` [1][2].

[1] http://www.linuxfromscratch.org/lfs/downloads/8.1-systemd/LFS-BOOK-8.1-systemd-NOCHUNKS.html#ch-system-creatingdirs
[2] link to fedora-devel post
---
 fhs-1-1.bee => fhs.be0 | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
 rename fhs-1-1.bee => fhs.be0 (69%)

diff --git a/fhs-1-1.bee b/fhs.be0
similarity index 69%
rename from fhs-1-1.bee
rename to fhs.be0
index 007395c5e..20e0d3c29 100755
--- a/fhs-1-1.bee
+++ b/fhs.be0
@@ -1,17 +1,18 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION fhs-1-1
+# BEE_VERSION fhs-8.1-0
 
 mee_install() {
-    mkdir -pv ${D}/{bin,boot,etc/opt,home,lib,mnt,opt}
+    mkdir -pv ${D}/{bin,boot,etc/{opt,sysconfig},home,lib,mnt,opt}
     mkdir -pv ${D}/{media/{floppy,cdrom},sbin,srv,var}
 
     install -dv -m 0750 ${D}/root
     install -dv -m 1777 ${D}/tmp ${D}/var/tmp
 
     mkdir -pv ${D}/usr/{,local/}{bin,include,lib,sbin,src}
-    mkdir -pv ${D}/usr/{,local/}share/{doc,info,locale,man}
+    mkdir -pv ${D}/usr/{,local/}share/{color,dict,doc,info,locale,man}
     mkdir -v  ${D}/usr/{,local/}share/{misc,terminfo,zoneinfo}
+    mkdir -v  ${D}/usr/libexec
     mkdir -pv ${D}/usr/{,local/}share/man/man{1..8}
 
     for dir in /usr /usr/local; do
@@ -22,7 +23,9 @@ mee_install() {
         x86_64) ln -sv lib ${D}/lib64 && ln -sv lib ${D}/usr/lib64 ;;
     esac
 
-    mkdir -v  ${D}/var/{lock,log,mail,run,spool}
+    mkdir -v  ${D}/var/{log,mail,spool}
+    ln -sv /run ${D}/var/run
+    ln -sv /run/lock ${D}/var/lock
     mkdir -pv ${D}/var/{opt,cache,lib/{misc,locate},local}