Patchwork [meta-oe] systemd-systemctl-native: fixed systemctl wrapper's `disable' action

login
mail settings
Submitter Otavio Salvador
Date May 2, 2012, 2:08 p.m.
Message ID <1335967723-11333-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/26823/
State Accepted
Commit fa7187883442441467087c3a954f9f40ee516d78
Headers show

Comments

Otavio Salvador - May 2, 2012, 2:08 p.m.
From: Mario Domenech Goulart <mario@ossystems.com.br>

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 .../systemd/systemd-systemctl-native/systemctl     |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl b/meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl
index c4a0a3f..6e7a05d 100755
--- a/meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl
+++ b/meta-oe/recipes-core/systemd/systemd-systemctl-native/systemctl
@@ -68,8 +68,8 @@  for service in $services; do
 			ln -s $service_file $ROOT/etc/systemd/system/$r.wants
 			echo "Enabled $service for $wanted_by."
 		else
-			rm -f $ROOT/etc/systemd/system/$r.wants/$service_file
-			rmdirs -p $ROOT/etc/systemd/system/$r.wants
+			rm -f $ROOT/etc/systemd/system/$r.wants/$service
+			rmdir --ignore-fail-on-non-empty -p $ROOT/etc/systemd/system/$r.wants
 			echo "Disabled $service for $wanted_by."
 		fi
 	done