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>
This commit is contained in:
Ross Burton 2016-04-06 20:45:57 +01:00 committed by Richard Purdie
parent 401905856f
commit e38ec0caa7
1 changed files with 1 additions and 1 deletions

View File

@ -108,7 +108,7 @@ for service in $services; do
# If any new unit types are added to systemd they should be added
# to this regular expression.
unit_types_re='\.\(service\|socket\|device\|mount\|automount\|swap\|target\|path\|timer\|snapshot\)$'
unit_types_re='\.\(service\|socket\|device\|mount\|automount\|swap\|target\|path\|timer\|snapshot\)\s*$'
if [ "$action" = "preset" ]; then
action=`egrep -sh $service $ROOT/etc/systemd/user-preset/*.preset | cut -f1 -d' '`
if [ -z "$action" ]; then