[olpc-powerd/f17] remove chkconfig calls, and ancient ohmd manipulation

Paul Fox pgf at fedoraproject.org
Fri Mar 30 20:10:11 UTC 2012


commit 63abeb69393625d6168c5bef4549a854ce5a3b25
Author: Paul Fox <pgf at laptop.org>
Date:   Thu Mar 29 15:42:55 2012 -0400

    remove chkconfig calls, and ancient ohmd manipulation

 olpc-powerd.spec |   15 ---------------
 1 files changed, 0 insertions(+), 15 deletions(-)
---
diff --git a/olpc-powerd.spec b/olpc-powerd.spec
index 9337181..6c71a92 100644
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@ -17,12 +17,6 @@ Source2: olpc-switchd.service
 BuildRequires: kernel-headers, NetworkManager-glib-devel
 Requires: olpc-kbdshim, ethtool, systemd-units, evtest
 
-# these are all for the manipulation of ohmd -- powerd doesn't need them.
-Requires(post): chkconfig
-Requires(preun): chkconfig
-Requires(post): initscripts
-Requires(preun): initscripts
-
 ExclusiveArch: %{ix86} %{arm}
 
 %description
@@ -101,10 +95,6 @@ install -p -m 644 %{SOURCE2} %{buildroot}/lib/systemd/system/olpc-switchd.servic
 %post
 # Only on install
 if [ $1 = 1 ] ; then
-    if test -e /etc/init.d/ohmd ; then
-        service ohmd stop >/dev/null 2>&1
-        chkconfig ohmd off 
-    fi
 	systemctl enable powerd.service
 	systemctl enable olpc-switchd.service
 fi
@@ -117,11 +107,6 @@ if [ $1 = 0 ] ; then
 	systemctl stop powerd.service
 	systemctl disable olpc-switchd.service
 	systemctl stop powerd.service
-    if test -e /etc/init.d/ohmd
-    then
-        /sbin/service ohmd start >/dev/null 2>&1
-        /sbin/chkconfig ohmd on
-    fi
 fi
 exit 0
 


More information about the scm-commits mailing list