/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to network-hooks.d/openvpn

  • Committer: Teddy Hogeborn
  • Date: 2012-03-08 21:57:33 UTC
  • mto: (237.7.110 trunk)
  • mto: This revision was merged to the branch mainline in revision 300.
  • Revision ID: teddy@recompile.se-20120308215733-8pz2o2lbuc19e9uc
Add D-Bus annotations support to methods, signals and properties.

* mandos (dbus_annotations): New; decorator to add annotations.
  (DBusObjectWithProperties._get_all_dbus_things): Bug fix: return
                                                   normal name if no
                                                   "_dbus_name"
                                                   attribute.
  (DBusObjectWithProperties.Introspect): Add annotation tags.
  (AlternateDBusNamesMetaclass.__new__): Copy annotations.
  

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/openvpn
31
31
fi
32
32
 
33
33
# Exit if DEVICE is set and it doesn't match the VPN interface
34
 
if [ -n "$DEVICE" ]; then
35
 
    case "$DEVICE" in
36
 
        *,"$VPNDEVICE"*|"$VPNDEVICE"*) :;;
37
 
        *) exit;;
38
 
    esac
 
34
if [ -n "$DEVICE" -a "$DEVICE" = "${DEVICE#$VPNDEVICE}" ]; then
 
35
    exit
39
36
fi
40
37
 
41
38
openvpn=/usr/sbin/openvpn
42
39
 
43
 
do_start(){
44
 
    "$openvpn" --cd "$MANDOSNETHOOKDIR" --daemon 'openvpn(Mandos)' \
45
 
        --writepid "$PIDFILE" --config "$CONFIG"
46
 
     sleep "$DELAY"
47
 
}
48
 
 
49
 
do_stop(){
50
 
    PID="`cat \"$PIDFILE\"`"
51
 
    if [ "$PID" -gt 0 ]; then
52
 
        kill "$PID"
53
 
    fi
54
 
}
55
 
 
56
 
case "${MODE:-$1}" in
57
 
    start|stop)
58
 
        do_"${MODE:-$1}"
 
40
case "$1" in
 
41
    start)
 
42
        "$openvpn" --cd "$MANDOSNETHOOKDIR" \
 
43
            --daemon 'openvpn(Mandos)' --writepid "$PIDFILE" \
 
44
            --config "$CONFIG"
 
45
        sleep "$DELAY"
 
46
        ;;
 
47
    stop)
 
48
        PID="`cat \"$PIDFILE\"`"
 
49
        if [ "$PID" -gt 0 ]; then
 
50
            kill "$PID"
 
51
        fi
59
52
        ;;
60
53
    files)
61
54
        echo "$openvpn"