From 273338056c99e07036fab6015f1a159a621d1eb3 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 1 Oct 2009 06:16:42 +0000 Subject: [PATCH] attempt to fix tests on f10 --- vbuild-init-vserver.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh index 4c71dd23..8da50467 100755 --- a/vbuild-init-vserver.sh +++ b/vbuild-init-vserver.sh @@ -182,13 +182,9 @@ function setup_vserver () { fi # start the vserver so we can do the following operations -# rm -f /tmp/go* -# echo -n ' about to start - WAITING for /tmp/go1' ; while true ; do [ -f /tmp/go1 ] && break || : ; done - $personality vserver $VERBOSE $vserver start -# echo -n ' started - WAITING for /tmp/go2' ; while true ; do [ -f /tmp/go2 ] && break || : ; done -#if true ; then -# echo SKIPPING for debug --- vserver was started -#else + # redirect out/err to protect against the vserver's init sequence getting stalled + # mostly used for f10 vservers created remotely through ssh + $personality vserver $VERBOSE $vserver start >& /dev/null [ "$pkg_method" = "yum" ] && $personality vserver $VERBOSE $vserver exec sh -c "rm -f /var/lib/rpm/__db*" [ "$pkg_method" = "yum" ] && $personality vserver $VERBOSE $vserver exec rpm --rebuilddb @@ -209,8 +205,6 @@ function setup_vserver () { # and /etc/hosts for at least localhost [ -f /vservers/$vserver/etc/hosts ] || echo "127.0.0.1 localhost localhost.localdomain" > /vservers/$vserver/etc/hosts -#fi - } function devel_or_vtest_tools () { -- 2.43.0