test: use ldconfig processing for roots as well

This commit is contained in:
Philippe Seewer 2010-03-05 11:42:04 +01:00
parent fdc421dbac
commit 8a08012764
9 changed files with 26 additions and 8 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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