: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
test -e "$UTIL_VSERVER_VARS" || {
- echo "Can not find util-vserver installation; aborting..." >&2
+ echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2
exit 1
}
. "$UTIL_VSERVER_VARS"
while test $i -gt 0; do
let --i
- d=$CONFDIR/${vservers[$i]}/apps/init
+ d=$__CONFDIR/${vservers[$i]}/apps/init
f=$d/mark
- { test "$OPTION_MARK" -a -r "$f" && grep -qx "$OPTION_MARK" "$f"; } || \
+ { test -n "$OPTION_MARK" -a -r "$f" && grep -qx "$OPTION_MARK" "$f"; } || \
{ test -z "$OPTION_MARK" && test ! -e "$f"; } || \
unset vservers[$i]
done
-makedir=$(mktemp -d /tmp/vserver-init.XXXXXX)
-okfile=$(mktemp /tmp/vserver-init.XXXXXX)
-passedfile=$(mktemp /tmp/vserver-init.XXXXXX)
-trap "rm -rf $makedir $resultfile $passedfile" EXIT
-
-defaulttty="$CONFDIR/.defaults/apps/init/tty"
-test -c "$defaulttty" || defaulttty=$(tty)
-test -c "$defaulttty" || defaulttty=/dev/null
+makedir=$($_MKTEMPDIR /tmp/vserver-init.XXXXXX)
+okfile=$($_MKTEMP /tmp/vserver-init.XXXXXX)
+passedfile=$($_MKTEMP /tmp/vserver-init.XXXXXX)
+trap "$_RM -rf $makedir $resultfile $passedfile" EXIT
test_cmd=false
case "$OPTION_FLAVOR" in
{
cat <<EOF
-TTY = ${defaulttty}
.%.stamp:
${TAB}$test_cmd || { \
${TAB}echo -n '.' >>$passedfile ; \
-${TAB}$_VSERVER --sync ${OPTION_DEBUG:+--debug} "\$*" ${OPTION_FLAVOR} >\$(TTY) 2>\$(TTY) <\$(TTY) ; }
+${TAB}$_VSERVER --defaulttty --sync ${OPTION_DEBUG:+--debug} "\$*" ${OPTION_FLAVOR}; }
${TAB}echo -n '.' >>$okfile
${TAB}@touch "\$@"
EOF
} >$makedir/Makefile
for i in "${vservers[@]}"; do
- d=$CONFDIR/$i/apps/init
+ d="$__CONFDIR/$i"/apps/init
echo "$i"
test -e "$d"/depends || continue
cat "$d"/depends
done | sort -u | while read vserver; do
- d=$CONFDIR/$vserver/apps/init
- test ! -e $d/tty || {
- echo -e ".$vserver.stamp:\tTTY=$d/tty" >>$makedir/Makefile
- }
+ d="$__CONFDIR/$vserver"/apps/init
case "$OPTION_FLAVOR" in
start)
#cat $makedir/Makefile
make -k ${NOOPTION_DEBUG:+-s} ${OPTION_PARALLEL:+-j$OPTION_PARALLEL} -C $makedir
-test -s "$passedfile" || exit 0
-test -s "$okfile" || exit 1
-cmp -s "$passedfile" "$okfile" || exit 2
+test -s "$passedfile" || exit 0
+test -s "$okfile" || exit 1
+$_CMP -s "$passedfile" "$okfile" || exit 2
exit 0