diff options
| -rw-r--r-- | pm/module.d/kernel | 8 | ||||
| -rw-r--r-- | pm/module.d/uswsusp | 4 | ||||
| -rw-r--r-- | pm/sleep.d/01grub | 34 | ||||
| -rwxr-xr-x | pm/sleep.d/10NetworkManager | 20 | ||||
| -rw-r--r-- | src/pm-powersave.in | 8 |
5 files changed, 37 insertions, 37 deletions
diff --git a/pm/module.d/kernel b/pm/module.d/kernel index 1c0aa12..5b3b501 100644 --- a/pm/module.d/kernel +++ b/pm/module.d/kernel @@ -5,7 +5,7 @@ check_suspend() do_suspend() { - pm-pmu --suspend || echo -n "mem" > /sys/power/state + pm-pmu --suspend || echo -n "mem" > /sys/power/state } check_hibernate() @@ -15,8 +15,8 @@ check_hibernate() do_hibernate() { - echo -n "${HIBERNATE_MODE}" > /sys/power/disk - echo -n "disk" > /sys/power/state + echo -n "${HIBERNATE_MODE}" > /sys/power/disk + echo -n "disk" > /sys/power/state } check_suspend_hybrid() @@ -26,5 +26,5 @@ check_suspend_hybrid() do_suspend_hybrid() { - return 1 + return 1 } diff --git a/pm/module.d/uswsusp b/pm/module.d/uswsusp index 468b604..87abc33 100644 --- a/pm/module.d/uswsusp +++ b/pm/module.d/uswsusp @@ -5,7 +5,7 @@ check_suspend() do_suspend() { - echo "mem" >/sys/power/state + echo "mem" >/sys/power/state } check_hibernate() @@ -32,5 +32,5 @@ do_suspend_hybrid() { # a brief perusal of the source indicates that -f bypasses # quirks application and the whitelist. - s2both -f + s2both -f } diff --git a/pm/sleep.d/01grub b/pm/sleep.d/01grub index ddc39ce..7c528ab 100644 --- a/pm/sleep.d/01grub +++ b/pm/sleep.d/01grub @@ -2,23 +2,23 @@ default_resume_kernel() { - case $(uname -m) in - i?86|x86_64|athlon) - ;; - *) # this is only valid for x86 and x86_64 - return 1 - ;; - esac - - [ -x /sbin/grubby -a -x /sbin/grub ] || return 1 - [ -e "/boot/vmlinuz-$(uname -r)" ] || return 1 - - out=$(/sbin/grubby --info /boot/vmlinuz-$(uname -r) |grep index) - [ -n "${out}" ] || return 1 - current=${out#index=} - echo "savedefault --default=${current} --once" | /sbin/grub --batch --no-floppy --device-map=/boot/grub/device.map --no-curses >/dev/null - - return 0 + case $(uname -m) in + i?86|x86_64|athlon) + ;; + *) # this is only valid for x86 and x86_64 + return 1 + ;; + esac + + [ -x /sbin/grubby -a -x /sbin/grub ] || return 1 + [ -e "/boot/vmlinuz-$(uname -r)" ] || return 1 + + out=$(/sbin/grubby --info /boot/vmlinuz-$(uname -r) |grep index) + [ -n "${out}" ] || return 1 + current=${out#index=} + echo "savedefault --default=${current} --once" | /sbin/grub --batch --no-floppy --device-map=/boot/grub/device.map --no-curses >/dev/null + + return 0 } RETVAL=0 diff --git a/pm/sleep.d/10NetworkManager b/pm/sleep.d/10NetworkManager index 1116609..9815a39 100755 --- a/pm/sleep.d/10NetworkManager +++ b/pm/sleep.d/10NetworkManager @@ -6,20 +6,20 @@ command_exists dbus-send || exit 1 suspend_nm() { - # Tell NetworkManager to shut down networking - dbus-send --system \ - --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ - org.freedesktop.NetworkManager.sleep + # Tell NetworkManager to shut down networking + dbus-send --system \ + --dest=org.freedesktop.NetworkManager \ + /org/freedesktop/NetworkManager \ + org.freedesktop.NetworkManager.sleep } resume_nm() { - # Wake up NetworkManager and make it do a new connection - dbus-send --system \ - --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ - org.freedesktop.NetworkManager.wake + # Wake up NetworkManager and make it do a new connection + dbus-send --system \ + --dest=org.freedesktop.NetworkManager \ + /org/freedesktop/NetworkManager \ + org.freedesktop.NetworkManager.wake } case "$1" in diff --git a/src/pm-powersave.in b/src/pm-powersave.in index 5098cf8..a1cdb4a 100644 --- a/src/pm-powersave.in +++ b/src/pm-powersave.in @@ -29,9 +29,9 @@ export PM_FUNCTIONS="@PM-UTILS-LIBDIR@/functions" . "${PM_FUNCTIONS}" if [ "$1" = "true" -o "$1" = "false" ] ; then - init_logfile "${POWERSAVE_LOGFILE}" - run_hooks power "$1" + init_logfile "${POWERSAVE_LOGFILE}" + run_hooks power "$1" else - echo "Argument needs to be true or false" >&2 - exit 1 + echo "Argument needs to be true or false" >&2 + exit 1 fi |