diff options
| author | Victor Lowther <victor.lowther@gmail.com> | 2009-11-30 22:42:39 -0600 |
|---|---|---|
| committer | Victor Lowther <victor.lowther@gmail.com> | 2009-11-30 22:42:39 -0600 |
| commit | 557b67691b14c580e57cdefbf9faf2852c1e6c77 (patch) | |
| tree | 44a7e7e7b4bc74c79c3d24021d89845ebbf523b3 /pm | |
| parent | 8b08ffdb3cf8ecce10309d7149474797832631d2 (diff) | |
| parent | f323e2cf2eddd683721be4eadbdc82f0454e7190 (diff) | |
Merge branch 'master' into native-quirk-db
Conflicts:
pm/sleep.d/98smart-kernel-video
98smart-kernel-video no longer exists, but we want the other fixups in the
master branch.
Diffstat (limited to 'pm')
| -rw-r--r-- | pm/pm-functions.in | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pm/pm-functions.in b/pm/pm-functions.in index 3320f0d..36f9e34 100644 --- a/pm/pm-functions.in +++ b/pm/pm-functions.in @@ -81,12 +81,6 @@ done . "${PM_FUNCTIONS}" -if command_exists hal-get-property; then - export CHASSIS_TYPE="$(hal-get-property --udi /org/freedesktop/Hal/devices/computer --key system.chassis.type 2>/dev/null || echo Unknown)" -else - export CHASSIS_TYPE=Unknown -fi - # Simple little logging function. # We do it this way because 'echo -n' is not posix. log() |