From 8a080127649f1c33b6445302178567cf8a775c14 Mon Sep 17 00:00:00 2001 From: Philippe Seewer Date: Fri, 5 Mar 2010 11:42:04 +0100 Subject: [PATCH] test: use ldconfig processing for roots as well --- test/TEST-10-RAID/test.sh | 2 ++ test/TEST-11-LVM/test.sh | 2 ++ test/TEST-12-RAID-DEG/test.sh | 2 ++ test/TEST-13-ENC-RAID-LVM/test.sh | 2 ++ test/TEST-14-IMSM/test.sh | 2 ++ test/TEST-20-NFS/test.sh | 6 ++++-- test/TEST-30-ISCSI/test.sh | 6 ++++-- test/TEST-40-NBD/test.sh | 6 ++++-- test/TEST-50-MULTINIC/test.sh | 6 ++++-- 9 files changed, 26 insertions(+), 8 deletions(-) diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh index 8bc7b448c..875f45404 100755 --- 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 ff6d7519c..798b24f30 100755 --- 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 2d3d3c04f..fb39551d1 100755 --- 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 2071a082b..436e42947 100755 --- 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 921589971..efddb9aa8 100755 --- 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 c10b0e1f0..380fe01c3 100755 --- 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 008aa3d0b..bde1e375b 100755 --- 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 c57fd3f1b..58d93f34d 100755 --- 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 fca9947e3..5d714f23c 100755 --- 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 -- 2.47.3