diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2009-09-28 11:37:27 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2009-09-28 11:37:27 -0400 |
| commit | 4f84696756ee3fac22f6e98d7a1df3d63537d12b (patch) | |
| tree | 66b7b4a2c39146394cdbc5b73ec5fe7c9eb93111 /cobbler | |
| parent | 99e4e6e3b2c92719ea0451c800dde4115dbaa74e (diff) | |
| parent | 1a430e3c9bfe6b9bb087bc9f9c40fb9c8df4c279 (diff) | |
| download | cobbler-4f84696756ee3fac22f6e98d7a1df3d63537d12b.tar.gz cobbler-4f84696756ee3fac22f6e98d7a1df3d63537d12b.tar.xz cobbler-4f84696756ee3fac22f6e98d7a1df3d63537d12b.zip | |
Merge branch 'release20'
Conflicts:
CHANGELOG
Diffstat (limited to 'cobbler')
| -rw-r--r-- | cobbler/action_check.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cobbler/action_check.py b/cobbler/action_check.py index 3a39c331..5a737f21 100644 --- a/cobbler/action_check.py +++ b/cobbler/action_check.py @@ -242,9 +242,8 @@ class BootCheck: """ Check if dhcpd is installed """ - rc = utils.subprocess_get(self.logger,"dhcpd --help") - if rc.find("exiting") == -1: - status.append("dhcpd is not installed and/or in path") + if not os.path.exists("/usr/sbin/dhcpd"): + status.append("dhcpd is not installed") def check_dnsmasq_bin(self,status): """ |