1 | #! /bin/sh /usr/share/dpatch/dpatch-run |
---|
2 | ## modern_udev.patch.dpatch by <superm1@ubuntu.com> |
---|
3 | ## |
---|
4 | ## All lines beginning with `## DP:' are a description of the patch. |
---|
5 | ## DP: No description. |
---|
6 | |
---|
7 | @DPATCH@ |
---|
8 | diff -urNad mythtv-0.22.0~trunk21333~/libs/libmyth/mediamonitor-unix.cpp mythtv-0.22.0~trunk21333/libs/libmyth/mediamonitor-unix.cpp |
---|
9 | --- mythtv-0.22.0~trunk21333~/libs/libmyth/mediamonitor-unix.cpp 2009-08-03 19:34:05.000000000 -0500 |
---|
10 | +++ mythtv-0.22.0~trunk21333/libs/libmyth/mediamonitor-unix.cpp 2009-08-18 01:22:28.000000000 -0500 |
---|
11 | @@ -223,15 +223,16 @@ |
---|
12 | QTextStream stream(udevinfo); |
---|
13 | QStringList args; |
---|
14 | |
---|
15 | + args << "info"; |
---|
16 | args << "-q"; |
---|
17 | args << "name"; |
---|
18 | args << "-rp"; |
---|
19 | args << sysfs; |
---|
20 | - udevinfo->start("udevinfo", args); |
---|
21 | + udevinfo->start("udevadm", args); |
---|
22 | |
---|
23 | if (!udevinfo->waitForStarted(2000 /*ms*/)) |
---|
24 | { |
---|
25 | - VERBOSE(VB_IMPORTANT, msg + ", Error - udevinfo failed to start!"); |
---|
26 | + VERBOSE(VB_IMPORTANT, msg + ", Error - udevadm failed to start!"); |
---|
27 | udevinfo->deleteLater(); |
---|
28 | return ret; |
---|
29 | } |
---|
30 | @@ -239,7 +240,7 @@ |
---|
31 | if (!udevinfo->waitForFinished(2000 /*ms*/)) |
---|
32 | { |
---|
33 | VERBOSE(VB_IMPORTANT, |
---|
34 | - msg + ", Error - udevinfo failed to end! Terminating"); |
---|
35 | + msg + ", Error - udevadm failed to end! Terminating"); |
---|
36 | udevinfo->kill(); |
---|
37 | udevinfo->deleteLater(); |
---|
38 | return ret; |
---|