Openembedded Core Discussions
 help / color / mirror / Atom feed
From: Randy Witt <rewitt@declaratino.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] systemctl: Support all unit types in the directives.
Date: Fri, 21 Jun 2013 00:12:57 -0400	[thread overview]
Message-ID: <1371787977-20263-1-git-send-email-rewitt@declaratino.com> (raw)

The Alias and WantedBy directives can accept all valid unit types when
using the systemctl from systemd. And since the systemctl script should
match the behavior of systemd as much as possible, add the current set
of unit types listed at
http://www.freedesktop.org/software/systemd/man/systemd.unit.html
to the Alias and WantedBy directives.

The deficiency was exposed when trying to use:
    Alias=default.target
in a foo.target. No symlink was created by running
"systemctl enable foo.target" during the package's postinst.

Signed-off-by: Randy Witt <rewitt@declaratino.com>
---
 meta/recipes-core/systemd/systemd-systemctl/systemctl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl
index 8abbdf6..f786656 100755
--- a/meta/recipes-core/systemd/systemd-systemctl/systemctl
+++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl
@@ -77,10 +77,14 @@ for service in $services; do
 	fi
 	echo "Found $service in $service_file"
 
+	# 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\)$'
+
 	# create the required symbolic links
 	wanted_by=$(sed '/^WantedBy[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file" \
 		        | tr ',' '\n' \
-		        | grep '\(\.target$\)\|\(\.service$\)')
+		        | grep "$unit_types_re")
 
 	for r in $wanted_by; do
 		echo "WantedBy=$r found in $service"
@@ -98,7 +102,7 @@ for service in $services; do
 	# create the required symbolic 'Alias' links
 	alias=$(sed '/^Alias[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file" \
 		        | tr ',' '\n' \
-		        | grep '\.service$')
+		        | grep "$unit_types_re")
 
 	for r in $alias; do
 		if [ "$action" = "enable" ]; then
-- 
1.8.2.1



                 reply	other threads:[~2013-06-21  4:13 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1371787977-20263-1-git-send-email-rewitt@declaratino.com \
    --to=rewitt@declaratino.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox