diff options
| author | Jonathan Cave <jonathan.cave@canonical.com> | 2019-06-27 11:10:46 +0100 |
|---|---|---|
| committer | Jonathan Cave <jonathan.cave@canonical.com> | 2019-06-27 11:10:46 +0100 |
| commit | 6ee38b7653ec2acc33cceeef26857fabbf800b24 (patch) | |
| tree | 6e7994a2aac47720bb31b3f53e3621fe55263d1e /units | |
| parent | 1a93cfaf7588ab3e74bffa8935561453e7a6bfeb (diff) | |
usb: use lsusb from checkbox-support
lsusb.py script needs to used when running from snaps. Use the version in checkbox-support to ensure it is available
Diffstat (limited to 'units')
| -rw-r--r-- | units/info/jobs.pxu | 2 | ||||
| -rw-r--r-- | units/usb/usb.pxu | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/units/info/jobs.pxu b/units/info/jobs.pxu index 69448a5..9ed5d33 100644 --- a/units/info/jobs.pxu +++ b/units/info/jobs.pxu @@ -103,7 +103,7 @@ category_id: com.canonical.plainbox::info user: root command: if [[ -v SNAP ]]; then - lsusb.py -f $SNAP/var/lib/usbutils/usb.ids + checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids else lsusb -vv | iconv -t 'utf-8' -c fi diff --git a/units/usb/usb.pxu b/units/usb/usb.pxu index 99623fb..75cf3c9 100644 --- a/units/usb/usb.pxu +++ b/units/usb/usb.pxu @@ -7,7 +7,7 @@ estimated_duration: 1.0 command: set -o pipefail if [[ -v SNAP ]]; then - lsusb.py -f $SNAP/var/lib/usbutils/usb.ids 2>/dev/null | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2 + checkbox-support-lsusb -f $SNAP/checkbox-runtime/var/lib/usbutils/usb.ids 2>/dev/null | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2 else lsusb 2>/dev/null | sort || echo "No USB devices were detected" >&2 fi |