/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 at recompile
  • Date: 2011-12-31 13:25:58 UTC
  • mto: This revision was merged to the branch mainline in revision 541.
  • Revision ID: teddy@recompile.se-20111231132558-z0dh7qgofgctmgri
* network-hooks.s/bridge: Don't use interface names directly; search
                          for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/bridge.conf (PORTS): Removed.
  (PORT_ADDRESSES): New.
* network-hooks.s/wireless: Don't use interface names directly; search
                            for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/wireless.conf: Specify address.

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,
19
16
CONFIG="$MANDOSNETHOOKDIR/bridge.conf"
20
17
 
21
18
addrtoif(){
22
 
    grep -liFe "$1" /sys/class/net/*/address \
23
 
        | sed -e 's,.*/\([^/]*\)/[^/]*,\1,' -e "/^${BRIDGE}\$/d"
 
19
    grep -liFe "$1" /sys/class/net/*/address | sed -e 's,.*/\([^/]*\)/[^/]*,\1,'
24
20
}
25
21
 
26
22
# Read config file, which must set "BRIDGE", "PORT_ADDRESSES", and
37
33
    exit
38
34
fi
39
35
 
40
 
brctl="/sbin/brctl"
41
 
for b in "$brctl" /usr/sbin/brctl; do
 
36
for b in /sbin/brctl /usr/sbin/brctl; do
42
37
    if [ -e "$b" ]; then
43
38
        brctl="$b"
44
39
        break
54
49
            ip link set dev "$interface" up
55
50
        done
56
51
        ip link set dev "$BRIDGE" up
57
 
        sleep "${DELAY%%.*}"
 
52
        sleep "$DELAY"
58
53
        if [ -n "$IPADDRS" ]; then
59
54
            for ipaddr in $IPADDRS; do
60
55
                ip addr add "$ipaddr" dev "$BRIDGE"