proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-10 00:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prefer iproute over ifconfig

Browse Source 
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Stéphane Graber 2015-03-09 12:14:29 -04:00
parent 24f97cf71d
commit 50066f4f7e
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config/init/common/lxc-net.in
View File

@ -35,29 +35,31 @@ _netmask2cidr ()
} }
ifdown() { ifdown() {
which ip >/dev/null 2>&1
if [ $? = 0 ]; then
ip link set dev $1 down
return
fi
which ifconfig >/dev/null 2>&1 which ifconfig >/dev/null 2>&1
if [ $? = 0 ]; then if [ $? = 0 ]; then
ifconfig $1 down ifconfig $1 down
return return
fi fi
which ip >/dev/null 2>&1
if [ $? = 0 ]; then
ip link set dev $1 down
fi
} }
ifup() { ifup() {
which ifconfig >/dev/null 2>&1
if [ $? = 0 ]; then
ifconfig $1 $2 netmask $3 up
return
fi
which ip >/dev/null 2>&1 which ip >/dev/null 2>&1
if [ $? = 0 ]; then if [ $? = 0 ]; then
MASK=`_netmask2cidr ${LXC_NETMASK}` MASK=`_netmask2cidr ${LXC_NETMASK}`
CIDR_ADDR="${LXC_ADDR}/${MASK}" CIDR_ADDR="${LXC_ADDR}/${MASK}"
ip addr add ${CIDR_ADDR} dev $1 ip addr add ${CIDR_ADDR} dev $1
ip link set dev $1 up ip link set dev $1 up
return
fi
which ifconfig >/dev/null 2>&1
if [ $? = 0 ]; then
ifconfig $1 $2 netmask $3 up
return
fi fi
} }

2
src/lxc/lxc-restore-net
View File

@ -17,7 +17,7 @@ while true; do
if [ "$CRTOOLS_SCRIPT_ACTION" = "network-unlock" ]; then if [ "$CRTOOLS_SCRIPT_ACTION" = "network-unlock" ]; then
brctl addif $bridge $veth brctl addif $bridge $veth
ifconfig $veth 0.0.0.0 up ip link set dev $veth up
fi fi
i=$((i+1)) i=$((i+1))