/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

  • Committer: Teddy Hogeborn
  • Date: 2012-01-01 04:02:00 UTC
  • Revision ID: teddy@recompile.se-20120101040200-8wgma707v4gi7hxn
* debian/rules (binary-common): Exclude network-hooks.d from
                                dh_fixperms.
* mandos (DBusObjectWithProperties.Set): Bug fix: handle byte arrays.
* mandos-clients.conf.xml (DESCRIPTION): Add reference to persistent
                                         state.
* mandos-options.xml (restore): Adjust wording slightly.
* mandos.xml (OPTIONS/--no-restore): Refer to "PERSISTENT STATE"
                                     section.
  (PERSISTENT STATE): New section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/bridge
15
15
 
16
16
CONFIG="$MANDOSNETHOOKDIR/bridge.conf"
17
17
 
18
 
# Read config file, which must set "BRIDGE", "PORTS", and optionally
19
 
# "IPADDRS" and "ROUTES".
 
18
addrtoif(){
 
19
    grep -liFe "$1" /sys/class/net/*/address \
 
20
        | sed -e 's,.*/\([^/]*\)/[^/]*,\1,'
 
21
}
 
22
 
 
23
# Read config file, which must set "BRIDGE", "PORT_ADDRESSES", and
 
24
# optionally "IPADDRS" and "ROUTES".
20
25
if [ -e "$CONFIG" ]; then
21
26
    . "$CONFIG"
22
27
fi
23
28
 
24
 
if [ -z "$BRIDGE" -o -z "$PORTS" ]; then
 
29
if [ -z "$BRIDGE" -o -z "$PORT_ADDRESSES" ]; then
25
30
    exit
26
31
fi
27
32
 
29
34
    exit
30
35
fi
31
36
 
 
37
for b in /sbin/brctl /usr/sbin/brctl; do
 
38
    if [ -e "$b" ]; then
 
39
        brctl="$b"
 
40
        break
 
41
    fi
 
42
done
 
43
 
32
44
case "$1" in
33
45
    start)
34
 
        brctl addbr "$BRIDGE"
35
 
        for port in $PORTS; do
36
 
            brctl addif "$BRIDGE" "$port"
 
46
        "$brctl" addbr "$BRIDGE"
 
47
        for address in $PORT_ADDRESSES; do
 
48
            interface=`addrtoif "$address"`
 
49
            "$brctl" addif "$BRIDGE" "$interface"
 
50
            ip link set dev "$interface" up
37
51
        done
38
 
        ip link set up "$BRIDGE"
 
52
        ip link set dev "$BRIDGE" up
 
53
        sleep "$DELAY"
39
54
        if [ -n "$IPADDRS" ]; then
40
55
            for ipaddr in $IPADDRS; do
41
56
                ip addr add "$ipaddr" dev "$BRIDGE"
48
63
        fi
49
64
        ;;
50
65
    stop)
51
 
        ip link set down "$BRIDGE"
52
 
        for port in $PORTS; do
53
 
            brctl delif "$BRIDGE" "$port"
 
66
        ip link set dev "$BRIDGE" down
 
67
        for address in $PORT_ADDRESSES; do
 
68
            interface=`addrtoif "$address"`
 
69
            ip link set dev "$interface" down
 
70
            "$brctl" delif "$BRIDGE" "$interface"
54
71
        done
55
 
        brctl delbr "$BRIDGE"
 
72
        "$brctl" delbr "$BRIDGE"
56
73
        ;;
57
74
    files)
58
75
        echo /bin/ip
59
 
        echo /usr/bin/brctl
 
76
        echo "$brctl"
 
77
        ;;
 
78
    modules)
 
79
        echo bridge
60
80
        ;;
61
81
esac