diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-02-24 11:46:38 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-02-24 11:48:32 +0000 |
commit | 369cc371f6d70aa45efd63fc8523b2eb42204622 (patch) | |
tree | 6fa1eeae7d7c8556fbf26462f2993056a2a97e53 | |
parent | fe33d320ad0ee1c626cfa60a59759ac1662d89f9 (diff) | |
download | definitions-369cc371f6d70aa45efd63fc8523b2eb42204622.tar.gz |
fhs-dirs: Usrmerge
-rw-r--r-- | strata/build-essential/fhs-dirs.morph | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/strata/build-essential/fhs-dirs.morph b/strata/build-essential/fhs-dirs.morph index 64474872..8ec3e9b3 100644 --- a/strata/build-essential/fhs-dirs.morph +++ b/strata/build-essential/fhs-dirs.morph @@ -3,6 +3,8 @@ kind: chunk description: create the FHS 2.3 directory hierarchy and the usual files install-commands: - sh ./create-fhs-dirs "$DESTDIR" +- rmdir "$DESTDIR"/bin +- rmdir "$DESTDIR"/sbin - install -m 644 passwd "$DESTDIR/etc/passwd" - install -m 600 shadow "$DESTDIR/etc/shadow" - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" @@ -11,6 +13,11 @@ install-commands: - install -m 644 issue "$DESTDIR/etc/issue" - install -m 644 services "$DESTDIR/etc/services" - install -m 644 protocols "$DESTDIR/etc/protocols" +- 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 - echo baserock > "$DESTDIR"/etc/hostname devices: - type: c |