From 999302e9d87aee2fe5f171995ee33118e8b30f8c Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 24 Apr 2013 13:37:21 +0200 Subject: systemd-systemctl: parse unit files more correctly Old script failed to parse unit files containing comments like | #Alias=some-alias or whitespaces like | WantedBy = foo correctly. Patch changes script to interpret keywords only when they are at the beginning of a line and ignores whitespaces before the '='. (From OE-Core rev: 443e75ee2c0e9a62df997aef24855bce54d39177) Signed-off-by: Enrico Scholz Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd-systemctl/systemctl | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'meta/recipes-core/systemd') diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl index d71c7eda8b..8abbdf6938 100755 --- a/meta/recipes-core/systemd/systemd-systemctl/systemctl +++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl @@ -78,8 +78,7 @@ for service in $services; do echo "Found $service in $service_file" # create the required symbolic links - wanted_by=$(grep WantedBy $ROOT/$service_file \ - | sed 's,WantedBy=,,g' \ + wanted_by=$(sed '/^WantedBy[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file" \ | tr ',' '\n' \ | grep '\(\.target$\)\|\(\.service$\)') @@ -97,8 +96,7 @@ for service in $services; do done # create the required symbolic 'Alias' links - alias=$(grep Alias $ROOT/$service_file \ - | sed 's,Alias=,,g' \ + alias=$(sed '/^Alias[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file" \ | tr ',' '\n' \ | grep '\.service$') @@ -114,8 +112,7 @@ for service in $services; do done # call us for the other required scripts - also=$(grep Also $ROOT/$service_file \ - | sed 's,Also=,,g' \ + also=$(sed '/^Also[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file" \ | tr ',' '\n') for a in $also; do echo "Also=$a found in $service" -- cgit v1.2.3-54-g00ecf