summaryrefslogtreecommitdiffstats
path: root/source/a/etc
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/etc')
-rw-r--r--source/a/etc/doinst.sh3
-rwxr-xr-xsource/a/etc/etc.SlackBuild2
2 files changed, 3 insertions, 2 deletions
diff --git a/source/a/etc/doinst.sh b/source/a/etc/doinst.sh
index 17571d3cf..cd4ed6a1f 100644
--- a/source/a/etc/doinst.sh
+++ b/source/a/etc/doinst.sh
@@ -64,7 +64,8 @@ config var/run/utmp.new
if [ -r etc/ld.so.conf.new -a -r etc/ld.so.conf ]; then
# Ensure that ld.so.conf contains the minimal set of paths:
- cat etc/ld.so.conf | while read pathline ; do
+ # (eliminate ld.so.conf.d line when adding paths to avoid repeats)
+ cat etc/ld.so.conf | grep -v ld.so.conf.d | while read pathline ; do
if ! grep "^${pathline}$" etc/ld.so.conf.new 1> /dev/null 2> /dev/null ; then
echo "$pathline" >> etc/ld.so.conf.new
fi
diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild
index ac74c0a9e..219443c8d 100755
--- a/source/a/etc/etc.SlackBuild
+++ b/source/a/etc/etc.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=etc
VERSION=15.0
-BUILD=${BUILD:-9}
+BUILD=${BUILD:-10}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then