Make dependency on triggerhappy optional

This commit is contained in:
Axel Beckert 2016-05-05 21:11:02 +02:00
parent 8945bccf72
commit 4926f63a12
3 changed files with 10 additions and 3 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
raspi-config (20160429) UNRELEASED; urgency=medium
* Downgrade hard dependency on triggerhappy to recommendation.
+ init script: Check if thd is present before using it.
-- Axel Beckert <abe@debian.org> Thu, 05 May 2016 20:57:55 +0200
raspi-config (20160428) jessie; urgency=medium
* [Simon Long]

3
debian/control vendored
View File

@ -9,6 +9,7 @@ Vcs-Browser: https://github.com/RPi-Distro/raspi-config
Package: raspi-config
Architecture: all
Depends: ${misc:Depends}, whiptail, parted, lua5.1, triggerhappy, alsa-utils
Depends: ${misc:Depends}, whiptail, parted, lua5.1, alsa-utils
Recommends: triggerhappy
Description: Raspberry Pi configuration tool
A simple configuration tool for common Raspberry Pi administrative tasks

View File

@ -14,8 +14,7 @@
case "$1" in
start)
log_daemon_msg "Checking if shift key is held down"
timeout 1 thd --dump /dev/input/event* | grep -q "LEFTSHIFT\|RIGHTSHIFT"
if [ $? -eq 0 ]; then
if [ -x /usr/sbin/thd ] && timeout 1 thd --dump /dev/input/event* | grep -q "LEFTSHIFT\|RIGHTSHIFT"; then
printf " Yes. Not enabling ondemand scaling governor"
log_end_msg 0
else