[systemd-devel] [systemd-commits] 2 commits - src/libsystemd

Tom Gundersen teg at jklm.no
Tue Apr 14 07:56:43 PDT 2015


On Tue, Apr 14, 2015 at 4:21 PM, Zbigniew Jędrzejewski-Szmek
<zbyszek at in.waw.pl> wrote:
> On Tue, Apr 14, 2015 at 07:19:42AM -0700, Tom Gundersen wrote:
>>  src/libsystemd/sd-device/sd-device.c |    9 ++++++---
>>  1 file changed, 6 insertions(+), 3 deletions(-)
>>
>> New commits:
>> commit 85091685af65831f379580c75b40776c20e245ee
>> Author: Tom Gundersen <teg at jklm.no>
>> Date:   Tue Apr 14 16:05:53 2015 +0200
>>
>>     sd-device: fix reading of subsystem
>>
>> diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
>> index 7d52e3c..d420bd0 100644
>> --- a/src/libsystemd/sd-device/sd-device.c
>> +++ b/src/libsystemd/sd-device/sd-device.c
>> @@ -772,10 +772,10 @@ _public_ int sd_device_get_subsystem(sd_device *device, const char **ret) {
>>                          r = device_set_subsystem(device, "drivers");
>>                  else if (path_startswith(device->devpath, "/subsystem/") ||
>>                           path_startswith(device->devpath, "/class/") ||
>> -                         path_startswith(device->devpath, "/buss/"))
>> +                         path_startswith(device->devpath, "/bus/"))
>>                          r = device_set_subsystem(device, "subsystem");
>>                  if (r < 0)
>> -                        return r;
>> +                        return log_debug_errno(r, "sd-devcie: could not set subsystem for %s: %m", device->devpath);
>                                                          ^^^^^^
>
> Zbyszek

Thanks! Fixed.

-t


More information about the systemd-devel mailing list