summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-01-18 18:32:18 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-01-18 18:32:18 +0000
commit41e7a0a7c611eb3185cc8eaf53f982ff4037106b (patch)
treebe051c1c78a3fb63c4ce2d3334b7d867f98dcfe2
parent959db032869243e1656c543e3029adf53e8750e9 (diff)
parent24114777bcae742e540d9a5a5a4d98d019f74a5d (diff)
downloadfhs-dirs-41e7a0a7c611eb3185cc8eaf53f982ff4037106b.tar.gz
Merge branch 'baserock/bootstrap' of gitorious.org:baserock/fhs-dirs into baserock/bootstrap
-rwxr-xr-xcreate-fhs-dirs5
-rw-r--r--fhs-dirs.morph1
-rw-r--r--ld.so.conf5
3 files changed, 11 insertions, 0 deletions
diff --git a/create-fhs-dirs b/create-fhs-dirs
index 53fb112..34e20bf 100755
--- a/create-fhs-dirs
+++ b/create-fhs-dirs
@@ -36,6 +36,7 @@ bin
boot
dev
etc
+etc/ld.so.conf.d
home
lib
media
@@ -85,6 +86,10 @@ do
install -d -o "$owner" -g "$group" -m "$perms" "$target/$dirname"
done
+# Add stupid lib64 symlinks.
+ln -s lib "$target/lib64"
+ln -s lib "$target/usr/lib64"
+
# Fix permissions and ownerships for some special cases.
chown "$owner:$group" "$target/."
chmod "$perms" "$target/."
diff --git a/fhs-dirs.morph b/fhs-dirs.morph
index 99a9b87..61325c2 100644
--- a/fhs-dirs.morph
+++ b/fhs-dirs.morph
@@ -10,6 +10,7 @@
"install group \"$DESTDIR/etc/group\"",
"install -d \"$DESTDIR/etc/init.d\"",
"install -m 744 rcS \"$DESTDIR/etc/init.d/rcS\"",
+ "install -m 644 ld.so.conf \"$DESTDIR/etc/ld.so.conf\"",
"echo baserock > \"$DESTDIR\"/etc/hostname"
]
}
diff --git a/ld.so.conf b/ld.so.conf
new file mode 100644
index 0000000..18cba60
--- /dev/null
+++ b/ld.so.conf
@@ -0,0 +1,5 @@
+/lib
+/usr/lib
+/usr/local/lib
+include /etc/ld.so.conf.d/*.conf
+