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 2f2e78da3a1fea3be48103798ed4b355a42c97dd..7972683201327640f293b54f9c3810522e671248 100755 (executable)
--- 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 8a12ec7cd850f3c3320d3c5e92ac53e41d63635a..1bba871d90238b2124a3d73663436cbda9c36b99 100755 (executable)
--- 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 8747791b15b3594638d804a584402500086af1fb..8195cd8afc43216d5ca956a8b4f48052cf7bc0e0 100755 (executable)
--- 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 a43a1c52e8d5de5d881fa1aecb143b5b97dec497..d0566b6f686e7621510d840537ace59c565ae0ee 100755 (executable)
--- 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"