Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Fedora Development (http://www.linux-archive.org/fedora-development/)
-   -   Make sure we get required nss-softokn libs in the images. (http://www.linux-archive.org/fedora-development/315923-make-sure-we-get-required-nss-softokn-libs-images.html)

David Cantrell 01-27-2010 04:46 PM

Make sure we get required nss-softokn libs in the images.
 
Check /lib and /usr/lib for these files.
---
scripts/mk-images | 13 ++++++++++---
scripts/upd-instroot | 3 +++
2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index edd4ecc..c4a3142 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -849,13 +849,20 @@ EOF
instbin $IMGPATH /usr/bin/wget $MBD_DIR /sbin/wget

# Indirect dependencies
- install -m 755 $IMGPATH/$LIBDIR/libfreebl3.so $MBD_DIR/$LIBDIR/
- install -m 755 $IMGPATH/usr/$LIBDIR/libsoftokn3.so $MBD_DIR/$LIBDIR/
+ for nsslib in freebl3 softokn3 nssdbm3 ; do
+ if [ -f $IMGPATH/$LIBDIR/lib$nsslib.so ]; then
+ install -m 755 $IMGPATH/$LIBDIR/lib$nsslib.so $MBD_DIR/$LIBDIR/
+ elif [ -f $IMGPATH/usr/$LIBDIR/lib$nsslib.so ]; then
+ install -m 755 $IMGPATH/usr/$LIBDIR/lib$nsslib.so $MBD_DIR/$LIBDIR/
+ else
+ echo "ERROR: *** Missing lib$nsslib.so" >&2
+ fi
+ done
+
install -m 755 $IMGPATH/usr/$LIBDIR/libsqlite3.so.0 $MBD_DIR/usr/$LIBDIR/
install -m 755 $IMGPATH/$LIBDIR/libnss_dns.so.2 $MBD_DIR/$LIBDIR/
install -m 755 $IMGPATH/$LIBDIR/libnss_files.so.2 $MBD_DIR/$LIBDIR/
install -m 755 $IMGPATH/$LIBDIR/libgcc_s.so.1 $MBD_DIR/$LIBDIR/
- install -m 755 $IMGPATH/usr/$LIBDIR/libnssdbm3.so $MBD_DIR/$LIBDIR/

install -m 644 $IMGPATH/etc/udev/udev.conf $MBD_DIR/etc/udev/udev.conf
for i in $IMGPATH/lib/udev/rules.d/*.rules ; do
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 2fbed22..e0c0615 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -286,9 +286,12 @@ KEEPFILE=${TMPDIR:-/tmp}/keepfile.$$
cat > $KEEPFILE <<EOF
$LIBDIR/dbus-1
$LIBDIR/libaio.so*
+$LIBDIR/libfreebl3.so
$LIBDIR/libmultipath.so*
$LIBDIR/libnss_dns*
$LIBDIR/libnss_files*
+$LIBDIR/libnssdbm3.so
+$LIBDIR/libsoftokn3.so
$LIBDIR/libwrap*.so*
$LIBDIR/multipath/*
$LIBDIR/security/pam_*
--
1.6.6

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


All times are GMT. The time now is 06:33 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.