~thomas-voss/mtp/kick-rebuild

Viewing changes to debian/mtp-server.conf

browse files at revision 64
compare with another revision
download diff
download tarball
view history from revision 64

Committer: CI Train Bot
Author(s): Mathieu Trudel-Lapierre
Date: 2015-02-19 19:56:10 UTC
mfrom: (63.1.4 mtp)
Revision ID: ci-train-bot@canonical.com-20150219195610-58noxvt1ra616bkb

Fix startup issues on desktop: guard against android_usb not being available and don't fail with an abort when /dev/mtp_usb isn't there; just error and return. Fixes: #1421664
Approved by: Sebastien Bacher, PS Jenkins bot

files modified:
debian/mtp-server.conf

server/server.cpp

Show diffs side-by-side

added added

removed removed

debian/mtp-server.conf

pre-start script

[ "$USER" != "lightdm" ] || { stop; exit 0; }

if grep -qc DISCONNECTED /sys/devices/virtual/android_usb/android0/state;

disconnected=`grep -c DISCONNECTED /sys/devices/virtual/android_usb/android0/state`;

if [ -z "$disconnected" ] || [ "$disconnected" -ge 1 ];

then

stop; exit 0;

Older »