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

Merge pull request #2229 from fliiiix/lxc_net_improvements

Browse Source 
Rename ifup/down and remove usless parameter passing
This commit is contained in:
Stéphane Graber 2018-03-22 12:35:43 -04:00 committed by GitHub
commit 1b849a8ffa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,17 +38,17 @@ _netmask2cidr ()
echo $(( $2 + (${#x}/4) )) echo $(( $2 + (${#x}/4) ))
} }
ifdown() { _ifdown() {
ip addr flush dev $1 ip addr flush dev ${LXC_BRIDGE}
ip link set dev $1 down ip link set dev ${LXC_BRIDGE} down
} }
ifup() { _ifup() {
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 ${LXC_BRIDGE}
ip link set dev $1 address $LXC_BRIDGE_MAC ip link set dev ${LXC_BRIDGE} address $LXC_BRIDGE_MAC
ip link set dev $1 up ip link set dev ${LXC_BRIDGE} up
} }
start() { start() {
@ -89,7 +89,7 @@ start() {
fi fi
fi fi
ifup ${LXC_BRIDGE} ${LXC_ADDR} ${LXC_NETMASK} _ifup
LXC_IPV6_ARG="" LXC_IPV6_ARG=""
if [ -n "$LXC_IPV6_ADDR" ] && [ -n "$LXC_IPV6_MASK" ] && [ -n "$LXC_IPV6_NETWORK" ]; then if [ -n "$LXC_IPV6_ADDR" ] && [ -n "$LXC_IPV6_MASK" ] && [ -n "$LXC_IPV6_NETWORK" ]; then
@ -151,7 +151,7 @@ stop() {
[ -f "${varrun}/network_up" ] || [ "$1" = "force" ] || { echo "lxc-net isn't running"; exit 1; } [ -f "${varrun}/network_up" ] || [ "$1" = "force" ] || { echo "lxc-net isn't running"; exit 1; }
if [ -d /sys/class/net/${LXC_BRIDGE} ]; then if [ -d /sys/class/net/${LXC_BRIDGE} ]; then
ifdown ${LXC_BRIDGE} _ifdown
iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 67 -j ACCEPT
iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p tcp --dport 67 -j ACCEPT iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p tcp --dport 67 -j ACCEPT
iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 53 -j ACCEPT iptables $use_iptables_lock -D INPUT -i ${LXC_BRIDGE} -p udp --dport 53 -j ACCEPT