mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 12:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

systemd-systemctl: parse unit files more correctly

Browse Source 
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 master rev: 443e75ee2c0e9a62df997aef24855bce54d39177)

(From OE-Core rev: 7a8205e28d4bc826b0dc3f692a958e1e8e9a1432)

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Enrico Scholz
2013-04-24 13:37:21 +02:00
committed by Richard Purdie
parent 6410b87876
commit a1f1c7fb1d
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meta/recipes-core/systemd/systemd-systemctl/systemctl
View File

@@ -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"