test -e "$f" || return 0
while read cap; do
case x"$cap" in
- (x|x\#) ;;
+ (x|x\#*) ;;
(*) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --ccap "$cap" );;
esac
done <"$f"
test -e "$f" || return 0
while read cap; do
case x"$cap" in
- (x|x\#) ;;
+ (x|x\#*) ;;
(*) OPTS_VATTRIBUTE=( "${OPTS_VATTRIBUTE[@]}" --bcap "$cap" );;
esac
done <"$f"
while read cap; do
case x"$cap" in
- (x|x\#) ;;
+ (x|x\#*) ;;
(!CAP_SYSCHROOT)
CAP_OPTS=( "${CAP_OPTS[@]}" --cap "$cap" )
CAPCHROOT_OPTS=( "${CAPCHROOT_OPTS[@]}" --nochroot )
;;
(x) ;;
- (*) echo "Unknown init-style '$INITSTYLE'; aborting" >&2;
- exit 1;;
+ (*) panic "Unknown init-style '$INITSTYLE'; aborting";;
esac
if test x"$INITSTYLE" != xrescue; then
test ! -e "$vdir"/flags || \
while read flag; do
case x"$flag" in
- (x|x\#) ;;
+ (x|x\#*) ;;
(xnamespace) ;;
(xfakeinit)
_IS_FAKEINIT=1
OPTS_VCONTEXT_CREATE=( $SILENT_OPT \
${ctx:+--xid "$ctx"} )
## put '--secure' at front so that it can be overridden
- OPTS_VATTRIBUTE=( --secure "${OPTS_VATTRIBUTE[@]}" )
+ OPTS_VATTRIBUTE=( --secure --flag default "${OPTS_VATTRIBUTE[@]}" )
}
function _generateScheduleOptions
eval $1=$(printf "f0:ff:%02x:%02x:%02x:%02x" $[ (~($2>>8)) & 0xff ] $[ ($2 & 0xff) ] $[ ($3>>8) & 0xff ] $[ $3 & 0xff ])
}
+function _getVLANInfo
+{
+ case "$1" in
+ (vlan????)
+ panic "\
+creation of VLAN_PLUS_VID devices is not supported; please create them
+before starting the vserver and use the 'nodev' flag then"
+ echo "$1 vlan ${1##vlan} VLAN_PLUS_VID"
+ ;;
+ (vlan*)
+ panic "\
+creation of VLAN_PLUS_VID_NO_PAD devices is not supported; please
+create them before starting the vserver and use the 'nodev' flag then"
+ echo "$1 vlan ${1##vlan} VLAN_PLUS_VID_N0_PAD"
+ ;;
+ (*.????) echo "$1 ${1%%.*} ${1##*.} DEV_PLUS_VID";;
+ (*.*) echo "$1 ${1%%.*} ${1##*.} DEV_PLUS_VID_NO_PAD";;
+ (*) return 1
+ esac
+
+ return 0
+}
+
## Usage: _processSingleInterface <interface-directory>
function _processSingleInterface
{
## LEGACY ALERT
test ! -e "$iface"/only_ip || break
- 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" >&2
- return 1
- }
- test -f /proc/net/vlan || {
- _addInterfaceCmd VCONFIG ${dev/./ }
- _addInterfaceCmd IP_ADDR 127.0.0.1/8 broadcast 127.255.255.255 dev "$dev"
- _addInterfaceCmd IP_LINK "$dev" $up
- }
- ;;
- esac
+ local vlan_info
+ if vlan_info=$(_getVLANInfo "$dev"); then
+ 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" >&2
+ return 1
+ }
+ test -f /proc/net/vlan -o -e "$iface"/novlandev || {
+ _addInterfaceCmd VCONFIG $vlan_info
+ }
+ fi
if ! test -e "$iface"/indirect; then
_addInterfaceCmd IP_ADDR "$ip${prefix:+/$prefix}" broadcast ${bcast:-+} ${name:+label "$dev:$name"} dev "$dev"
shift 2
$_MODPROBE ${name:+-o "$name"} "$mod" "$@"
;;
- NAMEIF) $_NAMEIF "$@";;
- VCONFIG) $_VCONFIG add "$@";;
+ NAMEIF) $_NAMEIF "$@";;
+ VCONFIG) $_VCONFIG set_name_type "$4" >/dev/null
+ $_VCONFIG add "$2" "$3" >/dev/null;;
IP_ADDR) $_IP addr add "$@";;
IP_ADDR_FLUSH) $_IP addr flush "$@";;
IP_LINK) $_IP link set "$@";;
IPTABLES) ;; ## TODO
MODPROBE) $_RMMOD "${2:-$1}";;
NAMEIF) ;;
- VCONFIG) $_VCONFIG rem "$@";;
+ VCONFIG) $_VCONFIG rem "$2.$3" >/dev/null;;
IP_ADDR) $_IP addr del "$@";;
IP_ADDR_FLUSH) ;;
IP_LINK) ;; ## Ignore the link-down command for now
if $_VSERVER_INFO - FEATURE vwait; then
local _is_tmpdir
_is_tmpdir=$($_MKTEMPDIR /tmp/vwaitstat.XXXXXX)
-
- $_NOHUP $_VWAIT --timeout "$VSHELPER_SYNC_TIMEOUT" \
- --terminate --status-fd 3 "$2" \
- >>$_is_tmpdir/out 2>$_is_tmpdir/err 3>$_is_tmpdir/fifo &
+ (
+ $_VWAIT --timeout "$VSHELPER_SYNC_TIMEOUT" \
+ --status-fd 3 "$2" \
+ >>$_is_tmpdir/out 2>$_is_tmpdir/err 3>$_is_tmpdir/fifo
+ rc=$?
+
+ if test "$rc" -ne 0 -a "$rc" -ne 1; then
+ $_VPS axf | $_EGREP -e "^[^ \t]+[ \t]+$S_CONTEXT[ \t]+" >&4
+ killContext "$S_CONTEXT" 9
+ fi
+
+ exit $rc
+ ) 4>$_is_tmpdir/procs &
+
echo "$!" >$_is_tmpdir/pid
eval "$3"=$_is_tmpdir
- fi
+ fi </dev/null
}
-## Usage: _waitForVWait <fifo> <pid>
+## Usage: _waitForVWait <vserver> <fifo> <pid> <procs>
function _waitForVWait
{
+ wait "$3" || :
+
declare -a status
- wait "$2" || :
- getFileArray status "$1"
+ declare -r procs=$(cat $4)
+
+ getFileArray status "$2"
set -- ${status[0]}
case "$1" in
killed by sending a SIGKILL signal. Please investigate the reasons
and/or increase the timeout in apps/vshelper/sync-timeout."
;;
- (TIMEOUT|\?\?\?|*) warning $"\
+
+ (TIMEOUT) warning $"\
+A timeout occured while waiting for the vserver to finish and it will
+be killed by sending a SIGKILL signal. The following process list
+might be useful for finding out the reason of this behavior:
+
+----------------------------------------------------------------------
+${procs:+$procs
+}----------------------------------------------------------------------"
+ ;;
+
+ (\?\?\?|*) warning $"\
internal error: 'vwait' exited with an unexpected status '$1'; I will
try to continue but be prepared for unexpected events."
- ;;
+ ;;
esac
return 0
local vwait_pid=$4
if test -d "$vwait_statdir"; then
- _waitForVWait "$vwait_statdir/fifo" "$( <$vwait_statdir/pid )"
+ _waitForVWait "$cfgdir" "$vwait_statdir/fifo" "$( <$vwait_statdir/pid )" "$vwait_statdir/procs"
elif test -n "$_NEED_VSHELPER_SYNC"; then
$_VSHELPER_SYNC "$fifo" "$VSHELPER_SYNC_TIMEOUT" || \
warning $"\
'nodev' instead of"
fi
done
-
+
find "$cfgdir" -type f -exec "$_CHECK_UNIXFILE" '{}' ';'
vshelper.doSanityCheck