X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=distrib%2Fdebian%2Finitpost;h=ccb6cabb56798fba7201cedd8c65e0e0c5c9946e;hb=82dab31ae667786b0193c1b7b74341ecc5046c61;hp=a5337c03d2f5b4181b3ba4206a54f497d924f69c;hpb=1cf33b33576848a1da7f3d43792e56f1c702459d;p=util-vserver.git diff --git a/distrib/debian/initpost b/distrib/debian/initpost index a5337c0..ccb6cab 100755 --- a/distrib/debian/initpost +++ b/distrib/debian/initpost @@ -21,6 +21,7 @@ cfgdir="$1" vdir="$cfgdir"/vdir . "$2" +. "$_LIB_VSERVER_BUILD_FUNCTIONS" # vserver name @@ -109,19 +110,7 @@ echo # start vserver before we can exec anything inside it $_VSERVER "$NAME" stop &>/dev/null || : -$_VSERVER "$NAME" start --rescue --rescue-init bash -c ' - exec > /dev/null - exec 2> /dev/null - - set -x - f=/tmp/startwait - trap "rm -f $f" EXIT - mkfifo $f - ( sleep 15; kill -s 9 -- -1 ) & - cat "$f" - kill -s 9 -- -1 - wait -' +startSleepingGuest "$NAME" 30 # run the configure commands from within the server export LANG=C LC_ALL=C @@ -139,7 +128,6 @@ for i in bootlogd checkfs checkroot halt hwclock.sh ifupdown klogd \ done # stop the vserver -$_VSERVER "$NAME" exec bash -c ': >/tmp/startwait' &>/dev/null || : -$_VSERVER "$NAME" stop &>/dev/null || : +stopSleepingGuest "$NAME" &>/dev/null || : popd &>/dev/null