summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorMartin Kelly <mkelly@xevo.com>2017-10-16 09:31:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-04 17:23:57 +0000
commit88d92fb301e37ecedd664d077c021f13399185da (patch)
treea99d197f5c47eb910f080961d23c529b8c7138ec /meta/recipes-core
parentef6babd638ba3c16aef39d8cacca3499d9717c0d (diff)
downloadpoky-88d92fb301e37ecedd664d077c021f13399185da.tar.gz
systemctl-native: add target.wants to target regex
The regex for acceptable systemd WantedBy/RequiredBy targets does not include target.wants, so a line like this: WantedBy=multi-user.target.wants gets silently ignored, even though it works fine on a real system. (From OE-Core rev: 8407100061e56346cafa06cc60eb63103d166bf8) Signed-off-by: Martin Kelly <mkelly@xevo.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rwxr-xr-xmeta/recipes-core/systemd/systemd-systemctl/systemctl2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl
index efad14ce17..6e5a1b7181 100755
--- a/meta/recipes-core/systemd/systemd-systemctl/systemctl
+++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl
@@ -108,7 +108,7 @@ for service in $services; do
108 108
109 # If any new unit types are added to systemd they should be added 109 # If any new unit types are added to systemd they should be added
110 # to this regular expression. 110 # to this regular expression.
111 unit_types_re='\.\(service\|socket\|device\|mount\|automount\|swap\|target\|path\|timer\|snapshot\)\s*$' 111 unit_types_re='\.\(service\|socket\|device\|mount\|automount\|swap\|target\|target\.wants\|path\|timer\|snapshot\)\s*$'
112 if [ "$action" = "preset" ]; then 112 if [ "$action" = "preset" ]; then
113 action=`egrep -sh $service $ROOT/etc/systemd/user-preset/*.preset | cut -f1 -d' '` 113 action=`egrep -sh $service $ROOT/etc/systemd/user-preset/*.preset | cut -f1 -d' '`
114 if [ -z "$action" ]; then 114 if [ -z "$action" ]; then