From: Ross Burton Date: Wed, 6 Apr 2016 19:45:57 +0000 (+0100) Subject: systemd-systemctl-native: fix unit detection X-Git-Tag: 2016-4~101 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0395162aa45a416db6a0a38e7ee6c0f808272393;p=openembedded-core.git systemd-systemctl-native: fix unit detection The regexs were too strict and didn't allow for trailing whitespace. [ YOCTO #9337 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- 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 # 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