mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 12:32:15 +02:00
systemd-systemctl: Fix WantedBy processing
An empty string assignment to WantedBy should clear all prior WantedBy
settings. This matches behavior of the current systemd implementation.
(From OE-Core rev: 8ede0083c28fadf1e83c9256618190b931edd306)
(From OE-Core rev: 9e3a2e143ef2aaab335439ddbe1ab976aeeed35d)
Signed-off-by: Bob Henz <robert_henz@jabil.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c653bfc68b)
Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
@@ -26,6 +26,9 @@ locations = list()
|
||||
|
||||
class SystemdFile():
|
||||
"""Class representing a single systemd configuration file"""
|
||||
|
||||
_clearable_keys = ['WantedBy']
|
||||
|
||||
def __init__(self, root, path, instance_unit_name):
|
||||
self.sections = dict()
|
||||
self._parse(root, path)
|
||||
@@ -80,6 +83,14 @@ class SystemdFile():
|
||||
v = m.group('value')
|
||||
if k not in section:
|
||||
section[k] = list()
|
||||
|
||||
# If we come across a "key=" line for a "clearable key", then
|
||||
# forget all preceding assignments. This works because we are
|
||||
# processing files in correct parse order.
|
||||
if k in self._clearable_keys and not v:
|
||||
del section[k]
|
||||
continue
|
||||
|
||||
section[k].extend(v.split())
|
||||
|
||||
def get(self, section, prop):
|
||||
|
||||
Reference in New Issue
Block a user