summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2006-10-17 17:57:09 -0400
committerJim Meyering <jim@meyering.net>2006-10-17 17:57:09 -0400
commit0b7cb71f25fcce64e4af8226e69478d0ebc1c7dc (patch)
treeca05a5f9f298f50d60b33767ce677993938ef5f1
parent24ee70ea9dd1a31122f19b027c70ab994357915a (diff)
downloadthird_party-cobbler-0b7cb71f25fcce64e4af8226e69478d0ebc1c7dc.tar.gz
third_party-cobbler-0b7cb71f25fcce64e4af8226e69478d0ebc1c7dc.tar.xz
third_party-cobbler-0b7cb71f25fcce64e4af8226e69478d0ebc1c7dc.zip
Fixes to reboot code, upgrades to enchant, ready for release of RHEL4 compatible version.
-rw-r--r--CHANGELOG1
-rw-r--r--NEWS4
-rw-r--r--cobbler.spec1
-rw-r--r--cobbler/action_enchant.py2
4 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index c479c60..cc48682 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ Cobbler CHANGELOG
* Tue Oct 17 2006 - 0.2.7-1
- Removed pexpect to enhance support for other distros
- enchant syntax changed (see NEWS)
+- now builds on RHEL4
* Tue Oct 17 2006 - 0.2.6-1
- Removing Cheetah and replacing w/ simpler templating system
diff --git a/NEWS b/NEWS
index 6671302..d0359de 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,11 @@ Cobbler NEWS
(all entries mdehaan@redhat.com unless noted otherwise)
======================================================
-0.2.7 -- pexpect no longer required, "enchant" changes
+0.2.7 -- RHEL4, pexpect not required, "enchant" changes
======================================================
+Cobbler now builds on RHEL4 out of the box!
+
In order to make Cobbler work on more platforms, the dependancy on
pexpect (a python module) has been removed. SSH is now invoked directly.
This means Cobbler now builds very easily on RHEL 4.
diff --git a/cobbler.spec b/cobbler.spec
index ba5e57e..058b2ad 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -56,6 +56,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
* Tue Oct 17 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.7-1
- Upstream changes (see CHANGELOG), includes removing pexpect as a require
+- This RPM now builds on RHEL4
* Tue Oct 17 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.6-1
- Upstream changes (see CHANGELOG), includes removing Cheetah as a require
diff --git a/cobbler/action_enchant.py b/cobbler/action_enchant.py
index 6c32d16..e343e69 100644
--- a/cobbler/action_enchant.py
+++ b/cobbler/action_enchant.py
@@ -71,7 +71,7 @@ class Enchant:
self.ssh_exec("koan --replace-self --system=%s --server=%s" % (self.system, self.settings.server))
else:
self.ssh_exec("koan --replace-self --profile=%s --server=%s" % (self.profile, self.settings.server))
- # self.ssh_exec(self.sysname, "/sbin/reboot")
+ self.ssh_exec("/sbin/reboot")
return True
except:
traceback.print_exc()