/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 bsnet
  • Date: 2011-12-25 00:40:09 UTC
  • Revision ID: teddy@fukt.bsnet.se-20111225004009-n5uimmac6h8djtv8
* plugin-runner.c (add_to_char_array): Added "nonnull" attribute.
  (add_argument): Added "nonnull" attribute on the "arg" argument.
  (add_environment): Added "nonnull" attribute on the "def" argument.
  (print_out_password, free_plugin): Added "nonnull" attribute.
  (main/parse_opt): Added "nonnull" attribute on the "state" argument.
* plugins.d/mandos-client.c (perror_plus): Bug fix; restore errno
                                           after fprintf().
* plugins.d/password-prompt.c (fprintf_plus): New.
 (conflict_detection/is_plymouth, main/parse_opt): Added "nonnull"
                                                   attribute.
 (conflict_detection/is_plymouth, conflict_detection, main): Bug fix;
                                                             Call
                                                             error_plus()
                                                             instead
                                                             of
                                                             error().
  (main/parse_opt): Added "nonnull" attribute on the "state" argument.
* plugins.d/plymouth.c (exec_and_wait): Added "nonnull" attribute on
                                        the "path" and "argv"
                                        arguments.
  (is_plymouth): Added "nonnull" attribute.

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
 
32
39
case "$1" in
33
40
    start)
34
 
        brctl addbr "$BRIDGE"
 
41
        "$brctl" addbr "$BRIDGE"
35
42
        for port in $PORTS; do
36
 
            brctl addif "$BRIDGE" "$port"
 
43
            "$brctl" addif "$BRIDGE" "$port"
 
44
            ip link set up "$port"
37
45
        done
38
46
        ip link set up "$BRIDGE"
 
47
        sleep "$DELAY"
39
48
        if [ -n "$IPADDRS" ]; then
40
49
            for ipaddr in $IPADDRS; do
41
50
                ip addr add "$ipaddr" dev "$BRIDGE"
50
59
    stop)
51
60
        ip link set down "$BRIDGE"
52
61
        for port in $PORTS; do
53
 
            brctl delif "$BRIDGE" "$port"
 
62
            ip link set down "$port"
 
63
            "$brctl" delif "$BRIDGE" "$port"
54
64
        done
55
 
        brctl delbr "$BRIDGE"
 
65
        "$brctl" delbr "$BRIDGE"
56
66
        ;;
57
67
    files)
58
68
        echo /bin/ip
59
 
        echo /usr/sbin/brctl
 
69
        echo "$brctl"
60
70
        ;;
61
71
    modules)
62
72
        echo bridge