/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
29
29
    exit
30
30
fi
31
31
 
32
 
for b in /sbin/brctl /usr/sbin/brctl; do
33
 
    if [ -e "$b" ]; then
34
 
        brctl="$b"
35
 
        break
36
 
    fi
37
 
done
38
 
 
39
32
case "$1" in
40
33
    start)
41
 
        "$brctl" addbr "$BRIDGE"
 
34
        brctl addbr "$BRIDGE"
42
35
        for port in $PORTS; do
43
 
            "$brctl" addif "$BRIDGE" "$port"
 
36
            brctl addif "$BRIDGE" "$port"
44
37
        done
45
38
        ip link set up "$BRIDGE"
46
39
        if [ -n "$IPADDRS" ]; then
57
50
    stop)
58
51
        ip link set down "$BRIDGE"
59
52
        for port in $PORTS; do
60
 
            "$brctl" delif "$BRIDGE" "$port"
 
53
            brctl delif "$BRIDGE" "$port"
61
54
        done
62
 
        "$brctl" delbr "$BRIDGE"
 
55
        brctl delbr "$BRIDGE"
63
56
        ;;
64
57
    files)
65
58
        echo /bin/ip
66
 
        echo "$brctl"
 
59
        echo /usr/sbin/brctl
67
60
        ;;
68
61
    modules)
69
62
        echo bridge