Merge lp:~xnox/update-notifier/lp1409129 into lp:update-notifier/ubuntu

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Martin Pitt
Approved revision: 854
Merged at revision: 854
Proposed branch: lp:~xnox/update-notifier/lp1409129
Merge into: lp:update-notifier/ubuntu
Diff against target: 29 lines (+6/-2)
2 files modified
debian/update-notifier-cds.conf (+3/-1)
debian/update-notifier-hp-firmware.conf (+3/-1)
To merge this branch: bzr merge lp:~xnox/update-notifier/lp1409129
Reviewer Review Type Date Requested Status
Martin Pitt Approve
James Hunt Pending
Ubuntu Core Development Team Pending
Review via email: mp+246016@code.launchpad.net

Commit message

Prepare for udev-bridge on the session bus.

Description of the change

Prepare for udev-bridge on the session bus.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

That'll be for the "no-classes" change in https://code.launchpad.net/~xnox/upstart/no-classes/+merge/245948, right? LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/update-notifier-cds.conf'
2--- debian/update-notifier-cds.conf 2014-12-10 20:41:46 +0000
3+++ debian/update-notifier-cds.conf 2015-01-09 21:24:58 +0000
4@@ -3,7 +3,9 @@
5
6 start on (
7 :sys:block-device-changed ID_FS_TYPE=iso9660 or
8- :sys:block-device-added ID_FS_TYPE=iso9660
9+ :sys:block-device-added ID_FS_TYPE=iso9660 or
10+ block-device-changed ID_FS_TYPE=iso9660 or
11+ block-device-added ID_FS_TYPE=iso9660
12 )
13
14
15
16=== modified file 'debian/update-notifier-hp-firmware.conf'
17--- debian/update-notifier-hp-firmware.conf 2013-02-22 21:44:37 +0000
18+++ debian/update-notifier-hp-firmware.conf 2015-01-09 21:24:58 +0000
19@@ -4,7 +4,9 @@
20 # only idVendor=03f0, idProduct="??{17,2a}" requires firmware
21 start on (
22 :sys:usb-device-added ID_VENDOR_ID=03f0 ID_MODEL_ID=??17 or
23- :sys:usb-device-added ID_VENDOR_ID=03f0 ID_MODEL_ID=??2a
24+ :sys:usb-device-added ID_VENDOR_ID=03f0 ID_MODEL_ID=??2a or
25+ usb-device-added ID_VENDOR_ID=03f0 ID_MODEL_ID=??17 or
26+ usb-device-added ID_VENDOR_ID=03f0 ID_MODEL_ID=??2a
27 )
28
29 script

Subscribers

People subscribed via source and target branches

to all changes: