/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to network-hooks.d/bridge

* network-hooks.d/bridge: Look for both /sbin/brctl and /usr/sbin/brctl.

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/bridge
6
6
# configuration file(s) should be copied into the
7
7
# /etc/mandos/network-hooks.d directory.
8
8
# 
9
 
# Copyright © 2011 Teddy Hogeborn
10
 
# Copyright © 2011 Björn Påhlsson
11
 
# 
12
9
# Copying and distribution of this file, with or without modification,
13
10
# are permitted in any medium without royalty provided the copyright
14
11
# notice and this notice are preserved.  This file is offered as-is,
18
15
 
19
16
CONFIG="$MANDOSNETHOOKDIR/bridge.conf"
20
17
 
21
 
addrtoif(){
22
 
    grep -liFe "$1" /sys/class/net/*/address \
23
 
        | sed -e 's,.*/\([^/]*\)/[^/]*,\1,' -e "/^${BRIDGE}\$/d"
24
 
}
25
 
 
26
 
# Read config file, which must set "BRIDGE", "PORT_ADDRESSES", and
27
 
# optionally "IPADDRS" and "ROUTES".
 
18
# Read config file, which must set "BRIDGE", "PORTS", and optionally
 
19
# "IPADDRS" and "ROUTES".
28
20
if [ -e "$CONFIG" ]; then
29
21
    . "$CONFIG"
30
22
fi
31
23
 
32
 
if [ -z "$BRIDGE" -o -z "$PORT_ADDRESSES" ]; then
 
24
if [ -z "$BRIDGE" -o -z "$PORTS" ]; then
33
25
    exit
34
26
fi
35
27
 
37
29
    exit
38
30
fi
39
31
 
40
 
brctl="/sbin/brctl"
41
 
for b in "$brctl" /usr/sbin/brctl; do
42
 
    if [ -e "$b" ]; then
43
 
        brctl="$b"
 
32
for brctl in /sbin/brctl /usr/sbin/brctl; do
 
33
    if [ -e "$brctl" ]; then
44
34
        break
45
35
    fi
46
36
done
47
37
 
48
38
case "$1" in
49
39
    start)
50
 
        "$brctl" addbr "$BRIDGE"
51
 
        for address in $PORT_ADDRESSES; do
52
 
            interface=`addrtoif "$address"`
53
 
            "$brctl" addif "$BRIDGE" "$interface"
54
 
            ip link set dev "$interface" up
 
40
        /usr/sbin/brctl addbr "$BRIDGE"
 
41
        for port in $PORTS; do
 
42
            /usr/sbin/brctl addif "$BRIDGE" "$port"
55
43
        done
56
 
        ip link set dev "$BRIDGE" up
57
 
        sleep "${DELAY%%.*}"
 
44
        ip link set up "$BRIDGE"
58
45
        if [ -n "$IPADDRS" ]; then
59
46
            for ipaddr in $IPADDRS; do
60
47
                ip addr add "$ipaddr" dev "$BRIDGE"
67
54
        fi
68
55
        ;;
69
56
    stop)
70
 
        ip link set dev "$BRIDGE" down
71
 
        for address in $PORT_ADDRESSES; do
72
 
            interface=`addrtoif "$address"`
73
 
            ip link set dev "$interface" down
74
 
            "$brctl" delif "$BRIDGE" "$interface"
 
57
        ip link set down "$BRIDGE"
 
58
        for port in $PORTS; do
 
59
            /usr/sbin/brctl delif "$BRIDGE" "$port"
75
60
        done
76
 
        "$brctl" delbr "$BRIDGE"
 
61
        /usr/sbin/brctl delbr "$BRIDGE"
77
62
        ;;
78
63
    files)
79
64
        echo /bin/ip