INTERFACE_CMDS_IDX=0
_HAVE_INTERFACE_OPTIONS=
_HAVE_CHBIND_OPTIONS=
+_IS_FAKEINIT=
INITSTYLE=sysv
(xplain)
INITCMD_START=( /sbin/init )
INITCMD_STOP=( /sbin/init )
- CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit )
- OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect )
+ _IS_FAKEINIT=1
test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" )
test -z "$runlevel_stop" || INITCMD_STOP=( "${INITCMD_STOP[@]}" "$runlevel_stop" )
;;
(xminit)
INITCMD_START=( /sbin/minit-start )
INITCMD_STOP=( /sbin/minit-stop )
- CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit )
+ _IS_FAKEINIT=1
INITCMD_START_SYNC=( "$_INITSYNC_MINIT_START" "$vdir" )
INITCMD_STOP_SYNC=( "$_INITSYNC_MINIT_STOP" "$vdir" )
- OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect )
test -z "$runlevel_start" || INITCMD_START=( "${INITCMD_START[@]}" "$runlevel_start" )
test -z "$runlevel_stop" || INITCMD_STOP=( "${INITCMD_STOP[@]}" "$runlevel_stop" )
;;
+ (xgentoo)
+ INITCMD_START=( /sbin/rc default )
+ INITCMD_STOP=( /sbin/rc shutdown )
+ ;;
+
(x) ;;
(*) echo "Unknown init-style '$INITSTYLE'; aborting" >&2;
exit 1;;
CHCONTEXT_FLAG_OPTS=()
- test -e "$vdir"/flags || return 0
-
+ test ! -e "$vdir"/flags || \
while read flag; do
case x"$flag" in
(x|x\#) ;;
(xnamespace) ;;
(xfakeinit)
- CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit )
- OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect )
+ _IS_FAKEINIT=1
;;
(*)
OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --flag "$flag" )
esac
done <"$vdir"/flags
- isAvoidNamespace "$cfgdir" || {
+ isAvoidNamespace "$vdir" || {
USE_VNAMESPACE=1
CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag namespace )
}
_generateNiceCommand "$1"
_generateInitOptions "$1"
_generateChcontextOptions "$1"
+
+ if test "$_IS_FAKEINIT"; then
+ CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit )
+ OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect )
+ fi
+}
+
+function _mountVserverInternal
+{
+ local fstab="$1"
+ test -e "$fstab" || return 0
+ shift
+
+ "$@" $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$fstab"
}
function mountVserver
local vdir=$1/vdir
local mtab_src
- test -e "$cfgdir"/fstab || return 0
+ test -e "$cfgdir"/fstab -o \
+ -e "$cfgdir"/fstab.local || return 0
findObject -r mtab_src "$vdir"/apps/init/mtab "$CONFDIR"/.defaults/init/mtab "$PKGLIBDEFAULTDIR"/mtab /dev/null
test -z "$NAMESPACE_CLEANUP" || isAvoidNamespace "$cfgdir" || \
$_VNAMESPACE --cleanup
-
- $_CHBIND "${CHBIND_OPTS[@]}" \
- $_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab
+
+ _mountVserverInternal "$cfgdir"/fstab $_CHBIND "${CHBIND_OPTS[@]}"
+ _mountVserverInternal "$cfgdir"/fstab.local
isAvoidNamespace "$cfgdir" || \
$_SECURE_MOUNT --rbind -n "$vdir" "/"
}
+function _umountVserverInternal
+{
+ local fstab="$1"
+ test -e "$fstab" || return 0
+ shift
+
+ tac "$fstab" | {
+ is_ok=1
+ while read src dst tmp; do
+ test "$tmp" || continue
+ case x"$src" in
+ (x\#*) continue;;
+ esac
+
+
+ "$@" $_EXEC_CD "$dst" $_UMOUNT -lfn . || is_ok=
+ done
+ test "$is_ok"
+ }
+}
+
function umountVserver
{
local cfgdir=$1
local vdir=$1/vdir
+ local is_ok=1
- is_ok=1
-
- isAvoidNamespace "$cfgdir" || return 0
- test -e "$cfgdir"/fstab || return 0
- test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir"
+ isAvoidNamespace "$cfgdir" || return 0
+ test -e "$cfgdir"/fstab -o \
+ -e "$cfgdir"/fstab.local || return 0
+ test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir"
- pushd "$vdir/" >/dev/null
- tac "$cfgdir"/fstab | while read src dst tmp; do
- test "$tmp" || continue
- case x"$src" in
- (x\#*) continue;;
- esac
-
- $_CHBIND "${CHBIND_OPTS[@]}" $_EXEC_CD "$dst" \
- $_UMOUNT -lfn . || is_ok=
- done
- popd >/dev/null
+ pushd "$vdir/" >/dev/null || return 1
+ _umountVserverInternal "$cfgdir"/fstab.local || is_ok=
+ _umountVserverInternal "$cfgdir"/fstab $_CHBIND "${CHBIND_OPTS[@]}" || is_ok=
+ popd >/dev/null || return 1
test "$is_ok"
}