summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2009-03-03 10:50:11 -0500
committerMichael DeHaan <mdehaan@redhat.com>2009-03-03 10:50:11 -0500
commite3dd04673bb043c2b6024b3b9cbb205d6dd6cbeb (patch)
treee8c63d64e8f41e833826ece64d7dc89d7c3a54dc
parent576ecc67d047229902dd3268d613b5a60f4e361a (diff)
downloadcobbler-e3dd04673bb043c2b6024b3b9cbb205d6dd6cbeb.tar.gz
cobbler-e3dd04673bb043c2b6024b3b9cbb205d6dd6cbeb.tar.xz
cobbler-e3dd04673bb043c2b6024b3b9cbb205d6dd6cbeb.zip
Don't run the full sync in import because during a sync very briefly all the files are rewritten and Beaker does not for some reason like this.
Conflicts: CHANGELOG
-rw-r--r--CHANGELOG5
-rw-r--r--cobbler/action_import.py7
2 files changed, 5 insertions, 7 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ccd3a237..9cee3fe5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
Cobbler CHANGELOG
-- XXX - 1.5.0
+- Tue Mar 3 2009 - 1.5.0
- (FEAT) Improved anaconda monitoring code
- (FEAT) preliminary linux-ris support for windows installs (WIP)
- (FEAT) download comps.xml always
@@ -16,7 +16,7 @@ Cobbler CHANGELOG
- (FEAT) use nameserver variable in network config in Anaconda when set
- (BUGF) sleep 5 seconds between power cycling systems
-- XXX - 1.4.3
+- Tue Mar 3 2009 - 1.4.3
- (BUGF) fix OMAPI support's (note: deprecated) usage of subprocess
- (BUGF) don't traceback on invalid cmd ("cobbler distro list --name=foo")
- (BUGF) fix import usage with --kickstart option (no more traceback)
@@ -38,6 +38,7 @@ Cobbler CHANGELOG
- (BUGF) move to PyYAML for YAML implementation since it is better maintained
- (BUGF) fixed web-interface editing of ownership
- (BUGF) fixed web-interface editing of management classes
+- (BUGF) don't run full sync in import, sync makes the install system unavailable for very short periods of time
- XXX - 1.4.2
- (BUGF) fix WTI power templates
diff --git a/cobbler/action_import.py b/cobbler/action_import.py
index 04701da4..2008c53c 100644
--- a/cobbler/action_import.py
+++ b/cobbler/action_import.py
@@ -209,11 +209,8 @@ class Importer:
print _("---------------- (associating kickstarts)")
self.kickstart_finder(distros_added)
- # ensure everything is nicely written out to the filesystem
- # (which is not so neccessary in newer Cobbler but we're paranoid)
-
- print _("---------------- (syncing)")
- self.api.sync()
+ # ensure bootloaders are present
+ self.api.pxegen.copy_bootloaders()
return True