diff -NurpP util-vserver-0.30.210.init/scripts/vserver.functions util-vserver-0.30.210.ctxm/scripts/vserver.functions --- util-vserver-0.30.210.init/scripts/vserver.functions 2006-08-05 23:37:28.000000000 +0200 +++ util-vserver-0.30.210.ctxm/scripts/vserver.functions 2006-08-05 23:43:39.000000000 +0200 @@ -745,12 +745,14 @@ function _mountVserverInternal test -e "$fstab" || return 0 shift + test -n "$_HAVE_CHCONTEXT_OPTIONS" || _generateChcontextOptions "$cfgdir" pushd "$vdir" >/dev/null # check whether / is mounted readonly or whether there is special # magic regarding the mtab file; when etc/mtab can not be touched, # add the '-n' flag to mount test -w etc -o -w etc/mtab || xflag=-n - "$@" $_SECURE_MOUNT -a $xflag --chroot --fstab "$fstab" --rootfs no + $_CHCONTEXT "${OPTS_VCONTEXT_CREATE[@]}" -- \ + "$@" $_SECURE_MOUNT -a $xflag --chroot --fstab "$fstab" --rootfs no popd >/dev/null } @@ -762,12 +764,14 @@ function mountRootFS local xflag= test -e "$fstab" || return 0 + test -n "$_HAVE_CHCONTEXT_OPTIONS" || _generateChcontextOptions "$cfgdir" pushd "$vdir" >/dev/null # check whether / is mounted readonly or whether there is special # magic regarding the mtab file; when etc/mtab can not be touched, # add the '-n' flag to mount test -w etc -o -w etc/mtab || xflag=-n - $_SECURE_MOUNT -a $xflag --chroot --fstab "$fstab" --rootfs only -n + $_CHCONTEXT "${OPTS_VCONTEXT_CREATE[@]}" -- \ + $_SECURE_MOUNT -a $xflag --chroot --fstab "$fstab" --rootfs only -n popd >/dev/null }