diff options
-rwxr-xr-x | meta/recipes-core/systemd/systemd-systemctl/systemctl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl index 8abbdf6938..f7866565b9 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 | |||
77 | fi | 77 | fi |
78 | echo "Found $service in $service_file" | 78 | echo "Found $service in $service_file" |
79 | 79 | ||
80 | # If any new unit types are added to systemd they should be added | ||
81 | # to this regular expression. | ||
82 | unit_types_re='\.\(service\|socket\|device\|mount\|automount\|swap\|target\|path\|timer\|snapshot\)$' | ||
83 | |||
80 | # create the required symbolic links | 84 | # create the required symbolic links |
81 | wanted_by=$(sed '/^WantedBy[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file" \ | 85 | wanted_by=$(sed '/^WantedBy[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file" \ |
82 | | tr ',' '\n' \ | 86 | | tr ',' '\n' \ |
83 | | grep '\(\.target$\)\|\(\.service$\)') | 87 | | grep "$unit_types_re") |
84 | 88 | ||
85 | for r in $wanted_by; do | 89 | for r in $wanted_by; do |
86 | echo "WantedBy=$r found in $service" | 90 | echo "WantedBy=$r found in $service" |
@@ -98,7 +102,7 @@ for service in $services; do | |||
98 | # create the required symbolic 'Alias' links | 102 | # create the required symbolic 'Alias' links |
99 | alias=$(sed '/^Alias[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file" \ | 103 | alias=$(sed '/^Alias[[:space:]]*=/s,[^=]*=,,p;d' "$ROOT/$service_file" \ |
100 | | tr ',' '\n' \ | 104 | | tr ',' '\n' \ |
101 | | grep '\.service$') | 105 | | grep "$unit_types_re") |
102 | 106 | ||
103 | for r in $alias; do | 107 | for r in $alias; do |
104 | if [ "$action" = "enable" ]; then | 108 | if [ "$action" = "enable" ]; then |