From c69c4c5d652732a412d2ae024c13efa7ca24dec7 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Fri, 13 Feb 2015 16:34:07 +0000
Subject: more things in fhs

---
 strata/build-essential/stage2-fhs-dirs.morph | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.morph
index f917787b..8b5fe569 100644
--- a/strata/build-essential/stage2-fhs-dirs.morph
+++ b/strata/build-essential/stage2-fhs-dirs.morph
@@ -4,7 +4,13 @@ description: create the FHS 2.3 directory hierarchy and the usual files
 install-commands:
 - sh ./create-fhs-dirs "$DESTDIR"
 - rmdir "$DESTDIR/usr/bin"
+- rmdir "$DESTDIR/bin"
+- rmdir "$DESTDIR/sbin"
+- rm -r  "$DESTDIR"/lib
 - ln -s /usr/bin "$DESTDIR"/bin
+- ln -s /usr/sbin "$DESTDIR"/sbin
+- ln -s /usr/lib "$DESTDIR"/lib
+- ln -s /usr/lib64 "$DESTDIR"/lib64
 - ln -s "$PREFIX/bin" "$DESTDIR/usr/bin"
 - install -m 644 passwd "$DESTDIR/etc/passwd"
 - install -m 600 shadow "$DESTDIR/etc/shadow"
@@ -15,10 +21,6 @@ install-commands:
 - install -m 644 services "$DESTDIR/etc/services"
 - install -m 644 protocols "$DESTDIR/etc/protocols"
 - echo baserock > "$DESTDIR"/etc/hostname
-- rm -r  "$DESTDIR"/lib
-- ln -s /usr/sbin "$DESTDIR"/sbin
-- ln -s /usr/lib "$DESTDIR"/lib
-- ln -s /usr/lib64 "$DESTDIR"/lib64
 devices:
 - type: c
   filename: /dev/console
-- 
cgit v1.2.1