Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 545006 | Differences between
and this patch

Collapse All | Expand All

(-)ldconfig-0.1 (-18 / +17 lines)
Lines 10-25 Link Here
10
10
11
LDSO_CONF_DIR=$(dirname $LDSO_CONF)
11
LDSO_CONF_DIR=$(dirname $LDSO_CONF)
12
12
13
LDSO_PATH=$(ls /lib/ld-musl-*.so.1)
14
if [[ ! -e $LDSO_PATH ]]; then
15
	echo "$LDSO_PATH not found" >&2
16
	exit 1
17
fi
18
19
LDSO_ARCH=$(basename $LDSO_PATH)
20
LDSO_NAME=${LDSO_ARCH%.so.1}
21
ETC_LDSO_PATH=/etc/${LDSO_NAME}.path
22
23
VERBOSE=0
13
VERBOSE=0
24
14
25
get_options() {
15
get_options() {
Lines 33-39 Link Here
33
			ROOT=$OPTARG
23
			ROOT=$OPTARG
34
			;;
24
			;;
35
		f)
25
		f)
36
			LDSOCONF=$OPTARG
26
			LDSO_CONF=$OPTARG
37
			;;
27
			;;
38
		\?)
28
		\?)
39
			echo "Invalid option: -$opt" >&2
29
			echo "Invalid option: -$opt" >&2
Lines 106-112 Link Here
106
				fi
96
				fi
107
			fi
97
			fi
108
		done
98
		done
109
	done < $LDSO_CONF
99
	done < $1
110
100
111
	echo $drs
101
	echo $drs
112
}
102
}
Lines 121-136 Link Here
121
}
111
}
122
112
123
get_options "$@"
113
get_options "$@"
124
drs=$(read_ldso_conf)
114
drs=$(read_ldso_conf "$LDSO_CONF")
115
for f in $LDSO_CONF.d/*; do
116
	drs="$drs $(read_ldso_conf "$f")"
117
done
125
drs=$(sanitize $drs)
118
drs=$(sanitize $drs)
126
119
120
LDSO_PATH=$(readelf -l /bin/bash | grep -o '\/lib\/ld-musl-.*\.so\.1')                     
121
if [[ ! -e $LDSO_PATH ]]; then
122
	echo "$LDSO_PATH not found" >&2
123
	exit 1
124
fi
125
126
LDSO_ARCH=$(basename $LDSO_PATH)
127
LDSO_NAME=${LDSO_ARCH%.so.1}
128
ETC_LDSO_PATH=/etc/${LDSO_NAME}.path
129
127
X=$(mktemp --tmpdir=/tmp ${LDSO_NAME}.XXXXXX)
130
X=$(mktemp --tmpdir=/tmp ${LDSO_NAME}.XXXXXX)
128
cat << EOF > $X
129
# $ETC_LDSO_PATH autogenerated by env-update; make all changes to
130
# contents of /etc/env.d directory
131
EOF
132
for d in $drs; do
131
for d in $drs; do
133
	echo $d >> $X
132
	echo $d >> $X
134
done
133
done
134
chmod 644 $X
135
mv $X $ETC_LDSO_PATH
135
mv $X $ETC_LDSO_PATH
136

Return to bug 545006