summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-04-06 20:45:57 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-09 23:00:44 +0100
commite38ec0caa75186da82e2d9a296069a1cefcf72bd (patch)
treea8268b729cea644ef8c5c9f0134dd0c57d5ceedb /meta/recipes-core
parent401905856f131add0affca9032c8b33c6277ee9a (diff)
downloadpoky-e38ec0caa75186da82e2d9a296069a1cefcf72bd.tar.gz
systemd-systemctl-native: fix unit detection
The regexs were too strict and didn't allow for trailing whitespace. [ YOCTO #9337 ] (From OE-Core rev: 0395162aa45a416db6a0a38e7ee6c0f808272393) Signed-off-by: Ross Burton <ross.burton@intel.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 1164dd4950..efad14ce17 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\)$' 111 unit_types_re='\.\(service\|socket\|device\|mount\|automount\|swap\|target\|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