summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-02-13 16:34:07 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-02-13 16:34:07 +0000
commitc69c4c5d652732a412d2ae024c13efa7ca24dec7 (patch)
tree35907164438a3c01d06ee5bd08b2b77eb82279fe
parentc122f90ef85f7ae3b8e540d08b9e3d459541fd45 (diff)
downloaddefinitions-c69c4c5d652732a412d2ae024c13efa7ca24dec7.tar.gz
more things in fhs
-rw-r--r--strata/build-essential/stage2-fhs-dirs.morph10
1 files 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