case "$1" in
(/*|./*) cat "$1";;
- (*) $_CHROOT_CAT -i "$1";;
+ (*) $_CHROOT_SH cat "$1";;
esac | sed -e "$2" >$tmp
- cmp -s $tmp "$1" || $_CHROOT_CAT -o "$1" <$tmp
+ cmp -s $tmp "$1" || $_CHROOT_SH truncate "$1" <$tmp
rm -f $tmp
}
+vserver=$1
+
+## Do some magic to set the vserver into a defined state
+$_VSERVER "$vserver" stop &>/dev/null || :
+$_VSERVER "$vserver" start --rescue bash -c '
+ exec >/dev/null
+ exec 2>/dev/null
+
+ set -x
+ f=/tmp/startwait
+ trap "rm -f $f" EXIT
+ mkfifo $f
+ ( sleep 10; kill -s 9 -- -1 ) &
+ cat "$f" >/dev/null
+ kill -s 9 -- -1
+ wait
+'
+
pushd "$vdir"/etc/init.d &>/dev/null ||
pushd "$vdir"/etc/rc.d/init.d &>/dev/null || exit 1
functions|halt|killall|single) ;;
syslog) ;;
*)
- $_VSERVER ----insecure "$1" chkconfig "$i" off
+ $_VSERVER "$1" chkconfig "$i" off
;;
esac
done
- relink /bin/true halt
popd >/dev/null
pushd "$vdir"/sbin &>/dev/null
popd >/dev/null
pushd "$vdir" &>/dev/null
- echo 'NETWORKING=yes' | $_CHROOT_CAT -a /etc/sysconfig/network
+ echo 'NETWORKING=yes' | $_CHROOT_SH append /etc/sysconfig/network
popd >/dev/null
pushd "$vdir" &>/dev/null
- : | $_CHROOT_CAT -o /etc/sysctl.conf
- echo "none / none defaults" | $_CHROOT_CAT -o /etc/fstab
- cat "$__DISTRIBDIR"/redhat/rc.sysinit | $_CHROOT_CAT -o /etc/rc.d/rc.sysinit.vserver
+ cat <<EOF | $_CHROOT_SH truncate /etc/init.d/halt
+#! /bin/bash
+
+exec /sbin/killall5 -15
+EOF
+ # TODO: remove race/symlink-attack
+ chmod +x etc/init.d/halt
+
+ : | $_CHROOT_SH truncate /etc/sysctl.conf
+ echo "none / none defaults" | $_CHROOT_SH truncate /etc/fstab
+ cat "$__DISTRIBDIR"/redhat/rc.sysinit | $_CHROOT_SH truncate /etc/rc.d/rc.sysinit.vserver
# TODO: remove race/symlink-attack
chmod +x etc/rc.d/rc.sysinit.vserver
subst etc/inittab 's!^\([^#].*:respawn:.* tty\)!#\1!;
s!si::sysinit:/etc/rc.d/rc.sysinit!si::sysinit:/etc/rc.d/rc.sysinit.vserver!'
popd >/dev/null
+
+$_VSERVER "$vserver" exec bash -c ': >/tmp/startwait' &>/dev/null || :
+$_VSERVER "$vserver" stop &>/dev/null || :