diff --git a/ChangeLog b/ChangeLog index 9a19bdb91a..b3ef434abb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-03-25 Dan Williams + + Patch from Björn Martensen + + * initscript/Arch/networkmanager.in + initscript/Arch/networkmanager-dispatcher.in + - Updates for Arch Linux (gnome.org #523701) + 2008-03-25 Dan Williams * libnm-glib/nm-ip4-config.c diff --git a/initscript/Arch/networkmanager-dispatcher.in b/initscript/Arch/networkmanager-dispatcher.in index e04dd89c57..cfb0fafcd9 100644 --- a/initscript/Arch/networkmanager-dispatcher.in +++ b/initscript/Arch/networkmanager-dispatcher.in @@ -25,7 +25,7 @@ case "$1" in if [ ! -z "$PID" -o $? -gt 0 ]; then stat_fail else - add_daemon NetworkManagerDispatcher + add_daemon networkmanager-dispatcher stat_done fi ;; @@ -35,7 +35,7 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else - rm_daemon NetworkManagerDispatcher + rm_daemon networkmanager-dispatcher stat_done fi ;; diff --git a/initscript/Arch/networkmanager.in b/initscript/Arch/networkmanager.in index 43ce91f324..02ec9a9ce7 100644 --- a/initscript/Arch/networkmanager.in +++ b/initscript/Arch/networkmanager.in @@ -28,7 +28,7 @@ case "$1" in if [ ! -z "$PID" -o $? -gt 0 ]; then stat_fail else - add_daemon NetworkManager + add_daemon networkmanager stat_done fi ;; @@ -38,7 +38,7 @@ case "$1" in if [ $? -gt 0 ]; then stat_fail else - rm_daemon NetworkManager + rm_daemon networkmanager stat_done fi ;; @@ -47,8 +47,22 @@ case "$1" in sleep 1 $0 start ;; + sleep) + /usr/bin/dbus-send --system \ + --dest=org.freedesktop.NetworkManager \ + --type=method_call \ + /org/freedesktop/NetworkManager \ + org.freedesktop.NetworkManager.sleep + ;; + wake) + /usr/bin/dbus-send --system \ + --dest=org.freedesktop.NetworkManager \ + --type=method_call \ + /org/freedesktop/NetworkManager \ + org.freedesktop.NetworkManager.wake + ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart|sleep|wake}" ;; esac exit 0