diff options
| author | Harald Hoyer <harald@redhat.com> | 2012-10-04 14:38:25 -0400 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2012-10-04 14:38:25 -0400 |
| commit | 167a320e5f265013c5af4127d9761a4d9c8d2e0d (patch) | |
| tree | 5a012b97e22df90ee281295f6bd42f5095ec365d | |
| parent | 2242cd92ee5c08ea97a6ceea7203790791471513 (diff) | |
| download | dracut-167a320e5f265013c5af4127d9761a4d9c8d2e0d.tar.gz dracut-167a320e5f265013c5af4127d9761a4d9c8d2e0d.tar.bz2 dracut-167a320e5f265013c5af4127d9761a4d9c8d2e0d.zip | |
s/libnss*.so/libnss_*.so so that we don't install libnss3.so
| -rwxr-xr-x | modules.d/95cifs/module-setup.sh | 2 | ||||
| -rwxr-xr-x | modules.d/95nfs/module-setup.sh | 2 | ||||
| -rwxr-xr-x | test/TEST-20-NFS/test.sh | 4 | ||||
| -rwxr-xr-x | test/TEST-50-MULTINIC/test.sh | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/modules.d/95cifs/module-setup.sh b/modules.d/95cifs/module-setup.sh index 2f2e78da..79726832 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 8a12ec7c..1bba871d 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 8747791b..8195cd8a 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 a43a1c52..d0566b6f 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" |