diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-05 16:07:43 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-05 16:07:43 -0300 |
| commit | 3a0008bd8a3e6f4f21181c1fadc17c3da3108907 (patch) | |
| tree | 175c9e1755980b2a955b1b9e6b93c1a3d431276f /community/scponly/setup_chroot.sh | |
| parent | 933e5d274b2a4e386565d2f3bb982682e168438b (diff) | |
| parent | 2bba02fdaa36de05dffef6a54b57c73259d7db53 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/alienarena/PKGBUILD
community/mumble/PKGBUILD
community/mysql-workbench/PKGBUILD
community/paintown/PKGBUILD
community/ufoai/PKGBUILD
core/dcron/PKGBUILD
core/udev/PKGBUILD
extra/qt/PKGBUILD
extra/texlive-bin/PKGBUILD
testing/opencv/PKGBUILD
testing/pciutils/PKGBUILD
testing/usbutils/PKGBUILD
Diffstat (limited to 'community/scponly/setup_chroot.sh')
| -rwxr-xr-x | community/scponly/setup_chroot.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/community/scponly/setup_chroot.sh b/community/scponly/setup_chroot.sh index cd1a260eb..1af9807e0 100755 --- a/community/scponly/setup_chroot.sh +++ b/community/scponly/setup_chroot.sh @@ -79,7 +79,7 @@ fi # # we also need to add some form of ld.so, here are some good guesses. # -LDSO_LIST="/lib/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 /usr/libexec/ld.so /lib64/ld-linux-x86-64.so.2 /lib/ld-linux.so.2 /usr/libexec/ld-elf.so.1" +LDSO_LIST="/lib/ld.so /libexec/ld-elf.so /libexec/ld-elf.so.1 /usr/libexec/ld.so /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2 /lib/ld-linux.so.2 /usr/libexec/ld-elf.so.1" for lib in $LDSO_LIST; do if [ -f $lib ]; then LDSOFOUND=1; @@ -95,6 +95,11 @@ if [ $? -eq 0 ]; then LIB_LIST="$LIB_LIST /lib/libnss_compat*" fi +ls /lib/libnss_files* > /dev/null 2>&1 +if [ $? -eq 0 ]; then + LIB_LIST="$LIB_LIST /lib/libnss_files*" +fi + # check that the configure options are correct for chrooted operation: if [ x/usr/sbin/useradd = x ]; then |