diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-12-11 00:34:13 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-12-14 06:04:53 +0100 |
| commit | 8d80f275303385eb9e2452f97f9c11be5c196862 (patch) | |
| tree | bea32045f40beec4b6fabe99b090dab6cbe9aad2 /src/libsystemd/sd-device | |
| parent | Merge pull request #17928 from keszybz/nss-logging (diff) | |
| download | systemd-8d80f275303385eb9e2452f97f9c11be5c196862.tar.xz systemd-8d80f275303385eb9e2452f97f9c11be5c196862.zip | |
sd-device: make TAGS= property prefixed and suffixed with ":"
The commit 6f3ac0d51766b0b9101676cefe5c4ba81feba436 drops the prefix and
suffix in TAGS= property. But there exists several rules that have like
`TAGS=="*:tag:*"`. So, the property must be always prefixed and suffixed
with ":".
Fixes #17930.
Diffstat (limited to 'src/libsystemd/sd-device')
| -rw-r--r-- | src/libsystemd/sd-device/sd-device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index 005801e1a6..d1aa3282bf 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -1534,7 +1534,7 @@ int device_properties_prepare(sd_device *device) { if (device->property_devlinks_outdated) { _cleanup_free_ char *devlinks = NULL; - r = set_strjoin(device->devlinks, " ", &devlinks); + r = set_strjoin(device->devlinks, " ", false, &devlinks); if (r < 0) return r; @@ -1550,7 +1550,7 @@ int device_properties_prepare(sd_device *device) { if (device->property_tags_outdated) { _cleanup_free_ char *tags = NULL; - r = set_strjoin(device->all_tags, ":", &tags); + r = set_strjoin(device->all_tags, ":", true, &tags); if (r < 0) return r; @@ -1561,7 +1561,7 @@ int device_properties_prepare(sd_device *device) { } tags = mfree(tags); - r = set_strjoin(device->current_tags, ":", &tags); + r = set_strjoin(device->current_tags, ":", true, &tags); if (r < 0) return r; |