test: use ldconfig processing for roots as well

diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
index 8bc7b448c876f7086dd15898802130c194063403..875f4540455fc6d16c14aa1498006809196e7664 100755 (executable)
--- a/test/TEST-10-RAID/test.sh
+++ b/test/TEST-10-RAID/test.sh
@@ -31,6 +31,8 @@ test_setup() {
        inst ./test-init /sbin/init
        find_binary plymouth >/dev/null && dracut_install plymouth
        (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+       cp -a /etc/ld.so.conf* $initdir/etc
+       sudo ldconfig -r "$initdir"
     )
  
     # second, install the files needed to make the root filesystem

diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
index ff6d7519c8cb3406d5e1fa6364016330c8b073db..798b24f30beeb54858bab55a2d38ff1b64d92250 100755 (executable)
--- a/test/TEST-11-LVM/test.sh
+++ b/test/TEST-11-LVM/test.sh
@@ -31,6 +31,8 @@ test_setup() {
        inst ./test-init /sbin/init
        find_binary plymouth >/dev/null && dracut_install plymouth
        (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+       cp -a /etc/ld.so.conf* $initdir/etc
+       sudo ldconfig -r "$initdir"
     )
  
     # second, install the files needed to make the root filesystem

diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
index 2d3d3c04fb48510de3eb0e0597727f949c0ccedb..fb39551d1d6c19b9959aad786c66d7c352ee2b40 100755 (executable)
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -66,6 +66,8 @@ test_setup() {
        inst ./test-init /sbin/init
        find_binary plymouth >/dev/null && dracut_install plymouth
        (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+       cp -a /etc/ld.so.conf* $initdir/etc
+       sudo ldconfig -r "$initdir"
     )
  
     # second, install the files needed to make the root filesystem

diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
index 2071a082bbba121036601d9373c9ce8b3e74aa84..436e42947e986b44d8d0ac7909731d92bafadd72 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
@@ -31,6 +31,8 @@ test_setup() {
        inst ./test-init /sbin/init
        find_binary plymouth >/dev/null && dracut_install plymouth
        (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+       cp -a /etc/ld.so.conf* $initdir/etc
+       sudo ldconfig -r "$initdir"
     )
  
     # second, install the files needed to make the root filesystem

diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
index 921589971e6da313a2acaadd3487a239b9d6be84..efddb9aa84f9a359c21623b05a0a371019fe0623 100755 (executable)
--- a/test/TEST-14-IMSM/test.sh
+++ b/test/TEST-14-IMSM/test.sh
@@ -53,6 +53,8 @@ test_setup() {
        inst ./test-init /sbin/init
        find_binary plymouth >/dev/null && dracut_install plymouth
        (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
+       cp -a /etc/ld.so.conf* $initdir/etc
+       sudo ldconfig -r "$initdir"
     )
  
     # second, install the files needed to make the root filesystem

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index c10b0e1f009e18de43d6812f263b7ff700f0a968..380fe01c3baab0021258106ad40eb388004eaf21 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -235,7 +235,8 @@ test_setup() {
        done
 
        /sbin/depmod -a -b "$initdir" $kernel
-       ldconfig -n -r "$initdir" /lib* /usr/lib*
+       cp -a /etc/ld.so.conf* $initdir/etc
+       sudo ldconfig -r "$initdir"
     )
 
     # Make client root inside server root
@@ -260,7 +261,8 @@ test_setup() {
            inst_library $i
        done
 
-       ldconfig -n -r "$initdir" /lib* /usr/lib*
+       cp -a /etc/ld.so.conf* $initdir/etc
+       sudo ldconfig -r "$initdir"
     )
 
     mkdir -p mnt/nfs/nfs3-5

diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
index 008aa3d0bdd320e22f69fe26f2aeb5ae1aeeebc1..bde1e375b86dd81997afb5d4888301cc54599de0 100755 (executable)
--- a/test/TEST-30-ISCSI/test.sh
+++ b/test/TEST-30-ISCSI/test.sh
@@ -75,7 +75,8 @@ test_setup() {
                cp ping grep
        inst ./client-init /sbin/init
        (cd "$initdir"; mkdir -p dev sys proc etc var/run tmp )
-       ldconfig -n -r "$initdir" /lib* /usr/lib*
+       cp -a /etc/ld.so.conf* $initdir/etc
+       sudo ldconfig -r "$initdir"
     )
  
     # second, install the files needed to make the root filesystem
@@ -154,7 +155,8 @@ test_setup() {
        inst /etc/group /etc/group
 
        /sbin/depmod -a -b "$initdir" $kernel
-       ldconfig -n -r "$initdir" /lib* /usr/lib*
+       cp -a /etc/ld.so.conf* $initdir/etc
+       sudo ldconfig -r "$initdir"
     )
 
     sudo umount mnt

diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index c57fd3f1b6043f885f37428baa13e0551f9c75b3..58d93f34ded0dead1db68c9d7a48a2c630ffbfc3 100755 (executable)
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -237,7 +237,8 @@ make_client_root() {
            inst_library $i
        done
 
-       ldconfig -n -r "$initdir" /lib* /usr/lib*
+       cp -a /etc/ld.so.conf* $initdir/etc
+       sudo ldconfig -r "$initdir"
     )
 
     sudo umount mnt
@@ -273,7 +274,8 @@ make_server_root() {
            inst_library $i
        done
 
-       ldconfig -n -r "$initdir" /lib* /usr/lib*
+       cp -a /etc/ld.so.conf* $initdir/etc
+       sudo ldconfig -r "$initdir"
     )
 
     sudo umount mnt

diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index fca9947e3421a935398b5bae415ddbb64f5761d2..5d714f23c9c58405add1784427044a660cd8e0d8 100755 (executable)
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -160,7 +160,8 @@ test_setup() {
        done
 
        /sbin/depmod -a -b "$initdir" $kernel
-       ldconfig -n -r "$initdir" /lib* /usr/lib*
+       cp -a /etc/ld.so.conf* $initdir/etc
+       sudo ldconfig -r "$initdir"
      )
 
     # Make client root inside server root
@@ -185,7 +186,8 @@ test_setup() {
            inst_library $i
        done
 
-       ldconfig -n -r "$initdir" /lib* /usr/lib*
+       cp -a /etc/ld.so.conf* $initdir/etc
+       sudo ldconfig -r "$initdir"
      )
 
      sudo umount mnt