Merge ~meribold/plainbox-provider-sru:prefer-after-suspend-usb-storage-preinserted into plainbox-provider-sru:master

Proposed by Lukas Waymann
Status: Merged
Approved by: Lukas Waymann
Approved revision: d0a2cdc51e29a8a9a3340c4e6c4d8dfe8ba13c53
Merged at revision: 32bceadc1c6197c095408b950abd905d7a8387cc
Proposed branch: ~meribold/plainbox-provider-sru:prefer-after-suspend-usb-storage-preinserted
Merge into: plainbox-provider-sru:master
Diff against target: 13 lines (+1/-1)
1 file modified
units/sru.pxu (+1/-1)
Reviewer Review Type Date Requested Status
Jonathan Cave (community) Approve
Review via email: mp+393151@code.launchpad.net

Description of the change

Use after-suspend-usb/storage-preinserted instead of suspend/usb_storage_preinserted_after_suspend. See the discussion at https://code.launchpad.net/~meribold/plainbox-provider-checkbox/+git/plainbox-provider-checkbox/+merge/393020 for details.

To post a comment you must log in.
Revision history for this message
Jonathan Cave (jocave) wrote :

Thanks, looks good to me. Please land this one first.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/sru.pxu b/units/sru.pxu
2index 8d25da4..faa89ce 100644
3--- a/units/sru.pxu
4+++ b/units/sru.pxu
5@@ -51,7 +51,7 @@ include:
6 suspend/audio_after_suspend_auto
7 suspend/network_resume_time_auto
8 suspend/wifi_resume_time_auto
9- suspend/usb_storage_preinserted_after_suspend
10+ after-suspend-usb/storage-preinserted
11 suspend/record_playback_after_suspend_auto
12 after-suspend-bluetooth4/beacon_eddystone_url_.*
13 suspend/cpu_after_suspend_auto

Subscribers

People subscribed via source and target branches