[oe-commits] Mario Domenech Goulart : systemd-systemctl-native: fixed systemctl wrapper' s `disable' action

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: fa7187883442441467087c3a954f9f40ee516d78
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=fa7187883442441467087c3a954f9f40ee516d78

Author: Mario Domenech Goulart <mario at ossystems.com.br>
Date:   Mon May 14 13:48:23 2012 +0000

systemd-systemctl-native: fixed systemctl wrapper's `disable' action

Signed-off-by: Mario Domenech Goulart <mario at ossystems.com.br>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 .../systemd/systemd-systemctl-native/systemctl     |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

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