summaryrefslogtreecommitdiffstats
path: root/ipa-client/ipa-install/ipa-client-install
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2011-05-04 10:21:27 -0400
committerMartin Kosek <mkosek@redhat.com>2011-05-06 15:46:41 +0200
commitd1fd695467b9e831f0a774605b0d44cd009230fe (patch)
treee6647e63437ea441aefb6d7ee75688b45db976ae /ipa-client/ipa-install/ipa-client-install
parenta4aba826a0e1327ba8df05da19d9ad0055d8269d (diff)
downloadfreeipa-d1fd695467b9e831f0a774605b0d44cd009230fe.zip
freeipa-d1fd695467b9e831f0a774605b0d44cd009230fe.tar.gz
freeipa-d1fd695467b9e831f0a774605b0d44cd009230fe.tar.xz
install-scripts: avoid using --list with chkconfig
This option does not behave properly in F15 as chkconfig does not list services moved to use systemd service files. Plus there are more direct ways than parsing its output, which are more reliable. Also just testing for the availability of the service calling 'chkconfig name' is enough. https://fedorahosted.org/freeipa/ticket/1206
Diffstat (limited to 'ipa-client/ipa-install/ipa-client-install')
-rwxr-xr-xipa-client/ipa-install/ipa-client-install6
1 files changed, 0 insertions, 6 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 5533b9a..6265a7c 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -169,12 +169,6 @@ def chkconfig(name, status):
chkconfig returns 1 if the service is unknown, 0 otherwise
"""
- (sout, serr, returncode) = run(['/sbin/chkconfig', name, '--list'], raiseonerr=False)
-
- # If the service isn't installed return with no error
- if returncode == 1:
- return
-
args = ['/sbin/chkconfig', name, status]
(sout, serr, returncode) = run(args, raiseonerr=False)