}
}
+## Usage: sendKillSequence <ctx> <signal> [<wait> <signal>]*
+function sendKillSequence
+{
+ local ctx=$1
+ local wait=
+ shift
+
+ while isCtxRunning "$ctx"; do
+ test -z "$wait" || sleep "$wait"
+
+ $_VKILL -c "$ctx" ${1:+-s "$1"}
+ test "$2" || break
+ wait="$2"
+ shift 2
+ done
+}
+
function _generateInitOptions
{
local vdir=$1
getFileValue runlevel_start "$cfgdir"/runlevel
getFileValue runlevel_start "$cfgdir"/runlevel.start
getFileValue runlevel_stop "$cfgdir"/runlevel.stop
- getFileArray INITKILL_SEQ "$cfgdir"/killseq
+ getFileArray INITKILL_SEQ "$cfgdir"/killseq
case x"$INITSTYLE" in
xsysv)
while read flag; do
case x"$flag" in
x|x#) ;;
- dummy) ;;
- fakeinit)
+ xnamespace) ;;
+ xfakeinit)
CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit )
;;
*)
;;
esac
done <"$vdir"/flags
+
+ isAvoidNamespace "$cfgdir" || \
+ CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag namespace )
}
function _generateChcontextOptions
_getInterfaceValue name '' "$iface"
_getInterfaceValue scope '' "$iface" "$iface/.."
- test "$ip" || { echo $"Can not read ip for '$iface'"; return 1; }
+ test "$ip" || { echo $"Can not read ip for '$iface'" >&2; return 1; }
test ! -e "$iface"/only_ip || unset dev
case "$dev" in
*.*)
test -d /proc/net/vlan || {
- echo -e $"VLAN device-name used, but vlan subsystem not enabled.\nTry to execute 'modprobe 8021q' before starting the vservers"
+ echo -e $"VLAN device-name used, but vlan subsystem not enabled.\nTry to execute 'modprobe 8021q' before starting the vservers" >&2
return 1
}
test -f /proc/net/vlan || {
function mountVserver
{
local cfgdir=$1
+ local ns_opt=$2
local vdir=$1/vdir
local mtab_src
test -e "$cfgdir"/fstab || return 0
- findObject -r mtab_src "$vdir"/apps/init/mtab "$CONFDIR"/.defaults/init/mtab /dev/null
+ findObject -r mtab_src "$vdir"/apps/init/mtab "$CONFDIR"/.defaults/init/mtab "$PKGLIBDEFAULTDIR"/mtab /dev/null
pushd "$vdir" >/dev/null
$_CHROOT_CAT /etc/mtab <"$mtab_src"
test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir"
$_CHBIND "${CHBIND_OPTS[@]}" \
$_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab
+
+ isAvoidNamespace "$cfgdir" || \
+ $_SECURE_MOUNT --rbind -n "$vdir" "/"
}
function umountVserver
is_ok=1
- test -e "$cfgdir"/fstab || return 0
+ isAvoidNamespace "$cfgdir" || return 0
+ test -e "$cfgdir"/fstab || return 0
test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir"
pushd "$vdir/" >/dev/null
x#*) continue;;
esac
- $_CHBIND "${CHBIND_OPTS[@]}" \
- $_SECURE_UMOUNT "$dst" || is_ok=
+ $_CHBIND "${CHBIND_OPTS[@]}" $_EXEC_CD "$dst" \
+ $_UMOUNT -lfn . || is_ok=
done
popd >/dev/null