local mac
local extip
local up="up"
+ local peer
_getInterfaceValue ip '' "$iface"
_getInterfaceValue extip '' "$iface" "$iface/.."
_getInterfaceValue name '' "$iface"
_getInterfaceValue scope '' "$iface" "$iface/.."
_getInterfaceValue mac '' "$iface"
+ _getInterfaceValue peer '' "$iface"
test -n "$ip" || { echo $"Can not read ip for '$iface'" >&2; return 1; }
test -n "$dev" -o -e "$iface"/nodev || {
_addInterfaceCmd TUNCTL "$dev" $tun_info
fi
- _addInterfaceCmd IP_ADDR "$ip${prefix:+/$prefix}" $use_bcast ${name:+label "$dev:$name"} dev "$dev"
+ _addInterfaceCmd IP_ADDR "$ip${prefix:+/$prefix}" $use_bcast ${name:+label "$dev:$name"} dev "$dev" ${peer:+peer "$peer"}
#_addInterfaceCmd IP_ROUTE "$ip${prefix:+/$prefix}" dev "$dev"
_addInterfaceCmd IP_LINK "$dev" $up
elif ! test -n "$N_CONTEXT"; then
local vdir="$1"
local d="$vdir"/spaces
- test ! -e "$d"/pid || \
- OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --pid )
+ ( test ! -e "$d"/pid &&
+ ! $_VSERVER_INFO PIDSPACE FEATURE ) || \
+ OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --pid )
test ! -e "$d"/net || {
OPTS_VSPACE=( "${OPTS_VSPACE[@]}" --net )
done < /proc/mounts
# separate loop to avoid races while reading /proc/mounts
for i in "${list_umount[@]}"; do
- $_UMOUNT -l -n "$i"
+ $_UMOUNT -l -n -i "$i"
done
}