diff options
| author | Victor Lowther <victor.lowther@gmail.com> | 2008-02-10 21:58:38 -0600 |
|---|---|---|
| committer | Victor Lowther <victor.lowther@gmail.com> | 2008-02-10 21:58:38 -0600 |
| commit | 5a7cb8d1fb6fe8068aea8ec904161c6dc912711b (patch) | |
| tree | 44b49db8b36cd1cb66fe0460cb0ba3192f43e6d9 /pm/sleep.d | |
| parent | 2ff6d1b801dab07a75eaa9cf773134574014180f (diff) | |
| parent | 104964140b8c896c1bf1cdace338e509ea3544f1 (diff) | |
Merge branch 'vlowther-security-fixes'
Diffstat (limited to 'pm/sleep.d')
| -rw-r--r-- | pm/sleep.d/01grub | 1 | ||||
| -rwxr-xr-x | pm/sleep.d/05led | 4 | ||||
| -rwxr-xr-x | pm/sleep.d/20video | 12 | ||||
| -rwxr-xr-x | pm/sleep.d/90clock | 3 | ||||
| -rwxr-xr-x | pm/sleep.d/94cpufreq | 2 | ||||
| -rwxr-xr-x | pm/sleep.d/95led | 2 | ||||
| -rwxr-xr-x | pm/sleep.d/99video | 10 |
7 files changed, 17 insertions, 17 deletions
diff --git a/pm/sleep.d/01grub b/pm/sleep.d/01grub index 4500c39..ddc39ce 100644 --- a/pm/sleep.d/01grub +++ b/pm/sleep.d/01grub @@ -7,6 +7,7 @@ default_resume_kernel() ;; *) # this is only valid for x86 and x86_64 return 1 + ;; esac [ -x /sbin/grubby -a -x /sbin/grub ] || return 1 diff --git a/pm/sleep.d/05led b/pm/sleep.d/05led index 58dbbfd..5b4f7b6 100755 --- a/pm/sleep.d/05led +++ b/pm/sleep.d/05led @@ -4,10 +4,10 @@ case "$1" in hibernate|suspend) - { echo "7 blink" >/proc/acpi/ibm/led ; } 2>/dev/null + echo "7 blink" >/proc/acpi/ibm/led ;; thaw|resume) - { echo "7 off" >/proc/acpi/ibm/led ; } 2>/dev/null + echo "7 off" >/proc/acpi/ibm/led ;; *) ;; diff --git a/pm/sleep.d/20video b/pm/sleep.d/20video index faed5a9..709226c 100755 --- a/pm/sleep.d/20video +++ b/pm/sleep.d/20video @@ -9,16 +9,16 @@ . "${PM_FUNCTIONS}" -if ! command_exists vbetool; then - vbe() { echo "vbetool not found" 1>&2; return 1; } -else +if command_exists vbetool; then vbe() { vbetool "$@"; } +else + vbe() { echo "vbetool not found" 1>&2; return 1; } fi -if ! command_exists radeontool; then - radeon() { echo "radeontool not found" 1>&2; return 1; } -else +if command_exists radeontool; then radeon() { radeontool "$@"; } +else + radeon() { echo "radeontool not found" 1>&2; return 1; } fi suspend_video() diff --git a/pm/sleep.d/90clock b/pm/sleep.d/90clock index 34df62e..4e6478e 100755 --- a/pm/sleep.d/90clock +++ b/pm/sleep.d/90clock @@ -1,7 +1,7 @@ #!/bin/sh . "${PM_FUNCTIONS}" -NTPD_LOCK="/var/run/pm-utils/pm-ntpd.lock" +NTPD_LOCK="pm-ntpd.lock" suspend_clock() { if try_lock "${NTPD_LOCK}"; then @@ -9,7 +9,6 @@ suspend_clock() { stopservice ntpd fi /sbin/hwclock --systohc >/dev/null 2>&1 0<&1 - return $? } resume_clock() { diff --git a/pm/sleep.d/94cpufreq b/pm/sleep.d/94cpufreq index a3db064..2783c74 100755 --- a/pm/sleep.d/94cpufreq +++ b/pm/sleep.d/94cpufreq @@ -22,7 +22,7 @@ thaw_cpufreq() ( cd /sys/devices/system/cpu/ for x in cpu[0-9]*/cpufreq/scaling_governor ; do [ -f "$x" ] || continue - local gov=$(restorestate "${x%%/*}_governor") + local gov="$(restorestate "${x%%/*}_governor")" [ -z "$gov" ] && continue echo "$gov" > "$x" done ) diff --git a/pm/sleep.d/95led b/pm/sleep.d/95led index 1704207..d1d769d 100755 --- a/pm/sleep.d/95led +++ b/pm/sleep.d/95led @@ -4,7 +4,7 @@ case "$1" in thaw|resume) - { echo "7 blink" >/proc/acpi/ibm/led ; } 2>/dev/null + echo "7 blink" >/proc/acpi/ibm/led ;; *) ;; diff --git a/pm/sleep.d/99video b/pm/sleep.d/99video index 4bfdf83..82f0469 100755 --- a/pm/sleep.d/99video +++ b/pm/sleep.d/99video @@ -11,10 +11,10 @@ reset_brightness() { for bl in /sys/class/backlight/* ; do - [ -f $bl/brightness ] || continue - BR=$(cat $bl/brightness) - echo 0 > $bl/brightness - echo $BR > $bl/brightness + [ -f "$bl/brightness" ] || continue + BR="$(cat $bl/brightness)" + echo 0 > "$bl/brightness" + echo "$BR" > "$bl/brightness" done } @@ -45,7 +45,7 @@ resume_video() vbe vbestate restore < /var/run/vbestate fi if [ "${DISPLAY_QUIRK_VBEMODE_RESTORE}" = "true" ]; then - vbe vbemode set $(cat /var/run/vbemode) + vbe vbemode set "$(cat /var/run/vbemode)" fi if [ "${DISPLAY_QUIRK_DPMS_ON}" = "true" ]; then vbe dpms on |