From: Harald Hoyer <harald@redhat.com>
Date: Thu, 4 Oct 2012 18:38:25 +0000 (-0400)
Subject: s/libnss*.so/libnss_*.so so that we don't install libnss3.so
X-Git-Tag: 024~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=167a320e5f265013c5af4127d9761a4d9c8d2e0d;p=thirdparty%2Fdracut.git

s/libnss*.so/libnss_*.so so that we don't install libnss3.so
---

diff --git a/modules.d/95cifs/module-setup.sh b/modules.d/95cifs/module-setup.sh
index 2f2e78da3..797268320 100755
--- a/modules.d/95cifs/module-setup.sh
+++ b/modules.d/95cifs/module-setup.sh
@@ -38,7 +38,7 @@ install() {
     _nsslibs=${_nsslibs#|}
     _nsslibs=${_nsslibs%|}
 
-    inst_libdir_file -n "$_nsslibs" 'libnss*.so*'
+    inst_libdir_file -n "$_nsslibs" 'libnss_*.so*'
 
     inst_hook cmdline 90 "$moddir/parse-cifsroot.sh"
     inst "$moddir/cifsroot.sh" "/sbin/cifsroot"
diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
index 8a12ec7cd..1bba871d9 100755
--- a/modules.d/95nfs/module-setup.sh
+++ b/modules.d/95nfs/module-setup.sh
@@ -48,7 +48,7 @@ install() {
     _nsslibs=${_nsslibs#|}
     _nsslibs=${_nsslibs%|}
 
-    inst_libdir_file -n "$_nsslibs" 'libnss*.so*'
+    inst_libdir_file -n "$_nsslibs" 'libnss_*.so*'
 
     inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
     inst_hook pre-udev 99 "$moddir/nfs-start-rpc.sh"
diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 8747791b1..8195cd8af 100755
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -261,7 +261,7 @@ test_setup() {
         _nsslibs=${_nsslibs#|}
         _nsslibs=${_nsslibs%|}
 
-	inst_libdir_file -n "$_nsslibs" 'libnss*.so*'
+	inst_libdir_file -n "$_nsslibs" 'libnss_*.so*'
 
 	(
 	    cd "$initdir";
@@ -310,7 +310,7 @@ test_setup() {
         _nsslibs=${_nsslibs#|}
         _nsslibs=${_nsslibs%|}
 
-	inst_libdir_file -n "$_nsslibs" 'libnss*.so*'
+	inst_libdir_file -n "$_nsslibs" 'libnss_*.so*'
 
 	cp -a /etc/ld.so.conf* $initdir/etc
 	sudo ldconfig -r "$initdir"
diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index a43a1c52e..d0566b6f6 100755
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -184,7 +184,7 @@ test_setup() {
         _nsslibs=${_nsslibs#|}
         _nsslibs=${_nsslibs%|}
 
-        inst_libdir_file -n "$_nsslibs" 'libnss*.so*'
+        inst_libdir_file -n "$_nsslibs" 'libnss_*.so*'
 
         inst /etc/nsswitch.conf /etc/nsswitch.conf
         inst /etc/passwd /etc/passwd
@@ -225,7 +225,7 @@ test_setup() {
         _nsslibs=${_nsslibs#|}
         _nsslibs=${_nsslibs%|}
 
-        inst_libdir_file -n "$_nsslibs" 'libnss*.so*'
+        inst_libdir_file -n "$_nsslibs" 'libnss_*.so*'
 
         cp -a /etc/ld.so.conf* $initdir/etc
         sudo ldconfig -r "$initdir"