declare -a INITKILL_SEQ=()
declare -a ENTER_SHELL=()
+declare -a OPTS_VCONTEXT_CREATE=()
+declare -a OPTS_VCONTEXT_MIGRATE=()
+declare -a OPTS_VATTRIBUTE=()
+USE_VNAMESPACE=
+
INTERFACE_CMDS_IDX=0
_HAVE_INTERFACE_OPTIONS=
_HAVE_CHBIND_OPTIONS=
NICE_CMD=( $_NICE -$nice )
}
+function _generateCCapabilityOptions
+{
+ local vdir=$1
+ local cap
+ local f="$vdir"/ccapabilities
+
+ test -e "$f" || return 0
+ while read cap; do
+ case x"$cap" in
+ (x|x\#) ;;
+ (*) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --ccap "$cap" );;
+ esac
+ done <"$f"
+}
+
+function _generateBCapabilityOptions
+{
+ local vdir=$1
+ local cap
+ local f="$vdir"/bcapabilities
+
+ test -e "$f" || return 0
+ while read cap; do
+ case x"$cap" in
+ (x|x\#) ;;
+ (*) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --bcap "$cap" );;
+ esac
+ done <"$f"
+}
+
function _generateCapabilityOptions
{
local vdir=$1
local cap
+ _generateBCapabilityOptions "$vdir"
+ _generateCCapabilityOptions "$vdir"
+
test -e "$vdir"/capabilities || return 0
CAP_OPTS=()
while read cap; do
case x"$cap" in
- x|x#) ;;
- !CAP_SYSCHROOT)
+ (x|x\#) ;;
+ (!CAP_SYSCHROOT)
CAP_OPTS=( "${CAP_OPTS[@]}" --cap "$cap" )
CAPCHROOT_OPTS=( "${CAPCHROOT_OPTS[@]}" --nochroot )
;;
- *)
- CAP_OPTS=( "${CAP_OPTS[@]}" --cap "$cap" );;
+ (*)
+ CAP_OPTS=( "${CAP_OPTS[@]}" --cap "$cap" )
+ ;;
esac
done <"$vdir"/capabilities
}
getFileArray INITKILL_SEQ "$cfgdir"/killseq
case x"$INITSTYLE" in
- xsysv)
+ (xsysv)
test "$runlevel_start" || runlevel_start=3
test "$runlevel_stop" || runlevel_stop=6
INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$runlevel_start" /var/run/utmp )
;;
- xplain)
+ (xplain)
INITCMD_START=( /sbin/init )
INITCMD_STOP=( /sbin/init )
CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit )
+ 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" )
;;
- xminit)
+ (xminit)
INITCMD_START=( /sbin/minit-start )
INITCMD_STOP=( /sbin/minit-stop )
CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit )
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" )
;;
- x) ;;
- *) echo "Unknown init-style '$INITSTYLE'; aborting" >&2;
+ (x) ;;
+ (*) echo "Unknown init-style '$INITSTYLE'; aborting" >&2;
exit 1;;
esac
while read flag; do
case x"$flag" in
- x|x#) ;;
- xfakeinit)
+ (x|x\#) ;;
+ (xnamespace) ;;
+ (xfakeinit)
CHCONTEXT_INIT_OPTS=( --disconnect --flag fakeinit )
+ OPTS_VCONTEXT_MIGRATE=( "${OPTS_VCONTEXT_MIGRATE[@]}" --fakeinit --disconnect )
;;
- *)
+ (*)
+ OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --flag "$flag" )
CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}"
--flag "$flag" )
;;
esac
done <"$vdir"/flags
+
+ isAvoidNamespace "$cfgdir" || {
+ USE_VNAMESPACE=1
+ CHCONTEXT_FLAG_OPTS=( "${CHCONTEXT_FLAG_OPTS[@]}" --flag namespace )
+ }
}
function _generateChcontextOptions
${ctx:+--ctx "$ctx"} \
${hostname:+--hostname "$hostname"} \
${domainname:+--domainname "$domainname"} )
+
+ OPTS_VCONTEXT_CREATE=( $SILENT_OPT \
+ ${ctx:+--xid "$ctx"} )
+ ## put '--secure' at front so that it can be overridden
+ OPTS_VATTRIBUTE=( --secure "${OPTS_VATTRIBUTE[@]}" )
}
function _getInterfaceValue
_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
+ test ! -e "$iface"/only_ip || {
+ echo $"The 'only_ip' flag for interface '$iface' is deprecated; use 'nodev' instead of" >&2
+ unset dev
+ }
+ test ! -e "$iface"/nodev || unset dev
if test "$dev"; then
_transformMask2Prefix prefix "$prefix" "$mask"
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 || {
_generateChcontextOptions "$1"
}
-function _isAvoidNamespace
-{
- test ! -e "$1"/namespace || return 1
- test -e "$CONFDIR"/.defaults/nonamespace -o \
- -e "$1"/nonamespace
-}
-
function mountVserver
{
local cfgdir=$1
popd >/dev/null
test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir"
+
+ test -z "$NAMESPACE_CLEANUP" || isAvoidNamespace "$cfgdir" || \
+ $_VNAMESPACE --cleanup
+
$_CHBIND "${CHBIND_OPTS[@]}" \
$_SECURE_MOUNT -a --chroot "$vdir" --fstab "$cfgdir"/fstab
- _isAvoidNamespace "$cfgdir" || \
+ isAvoidNamespace "$cfgdir" || \
$_SECURE_MOUNT --rbind -n "$vdir" "/"
}
is_ok=1
- _isAvoidNamespace "$cfgdir" || return 0
+ isAvoidNamespace "$cfgdir" || return 0
test -e "$cfgdir"/fstab || return 0
test "$_HAVE_CHBIND_OPTIONS" || _generateChbindOptions "$cfgdir"
tac "$cfgdir"/fstab | while read src dst tmp; do
test "$tmp" || continue
case x"$src" in
- x#*) continue;;
+ (x\#*) continue;;
esac
$_CHBIND "${CHBIND_OPTS[@]}" $_EXEC_CD "$dst" \