/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

Hooks take new "modules" argument, and hook names can contain periods.

* debian/mandos-client.README.Debian: Adjust wording.
* debian/rules (binary-common): Exclude nework-hooks.d directory from
                                dh_fixperms.
* initramfs-tools-hook: Also create network hook directory.  Allow
                        periods in hook names.  Only run executable
                        files in hook directory.  Copy needed modules.
* network-hooks.d/bridge: Fix "/usr/bin/brctl" to "/usr/sbin/brctl".
                          Also take "modules" argument.
* plugins.d/mandos-client.xml (NETWORK HOOKS/REQUIREMENTS): Document
                                                            the
                                                            allowing
                                                            of periods
                                                            in hook
                                                            names.
  (NETWORK HOOKS/REQUIREMENTS/files): Adjust wording.
  (NETWORK HOOKS/REQUIREMENTS/modules): New.
  (NETWORK HOOKS/REQUIREMENTS/MANDOSNETHOOKDIR): Clarify.
  (NETWORK HOOKS/REQUIREMENTS/MODE): Add "modules".

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