diff options
| author |   Ross Burton <ross.burton@intel.com> | 2016-04-06 20:45:57 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-08 08:04:28 +0100 |
| commit | 0395162aa45a416db6a0a38e7ee6c0f808272393 (patch) | |
| tree | 25210ebf45304c5346882037ac9fb62d60cc63ed | |
| parent | ba29845a5b9bf16cda2230540d7ce17d0f82e8fa (diff) | |
| download | openembedded-core-contrib-0395162aa45a416db6a0a38e7ee6c0f808272393.tar.gz | |
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 <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | meta/recipes-core/systemd/systemd-systemctl/systemctl | 2 |
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 # 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 |