diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | cobbler.spec | 7 | ||||
| -rw-r--r-- | cobbler/action_sync.py | 7 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 13 insertions, 4 deletions
@@ -3,6 +3,7 @@ Cobbler CHANGELOG - Thr May 28 2008 - 1.0.1 - Fix misformatted warning in "check" +- Do not own tftpboot - Wed May 27 2008 - 1.0.0 - Merge devel branch onto master, this is 1.0 diff --git a/cobbler.spec b/cobbler.spec index cccaa63..968f337 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -110,9 +110,6 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT /var/www/cobbler/webui/*.js /var/www/cobbler/webui/*.png /var/www/cobbler/webui/*.html -%defattr(-,root,root) -%dir /tftpboot/pxelinux.cfg -%dir /tftpboot/images %{_bindir}/cobbler %{_bindir}/cobblerd %dir /etc/cobbler @@ -188,6 +185,10 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog +* Thu May 28 2008 Michael DeHaan <mdehaan@redhat.com> - 1.0.1-1 +- Upstream changes (see CHANGELOG) +- stop owning files in tftpboot + * Wed May 27 2008 Michael DeHaan <mdehaan@redhat.com> - 1.0.0-2 - Upstream changes (see CHANGELOG) diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py index 55cdad5..fab96a6 100644 --- a/cobbler/action_sync.py +++ b/cobbler/action_sync.py @@ -129,7 +129,14 @@ class BootSync: if x in ["kickstarts","kickstarts_sys","images","systems","distros","profiles","repo_profile","repo_system"]: # clean out directory contents utils.rmtree_contents(path) + pxelinux_dir = os.path.join(self.bootloc, "pxelinux.cfg") + images_dir = os.path.join(self.bootloc, "images") + if not os.path.exists(pxelinux_dir): + utils.makedir(pxelinux_dir) + if not os.path.exists(images_dir): + utils.makedir(images_dir) utils.rmtree_contents(os.path.join(self.bootloc, "pxelinux.cfg")) utils.rmtree_contents(os.path.join(self.bootloc, "images")) + @@ -4,7 +4,7 @@ import sys from distutils.core import setup, Extension import string -VERSION = "1.0.0" +VERSION = "1.0.1" SHORT_DESC = "Network Boot and Update Server" LONG_DESC = """ Cobbler is a network boot and update server. Cobbler supports PXE, provisioning virtualized images, and reinstalling existing Linux machines. The last two modes require a helper tool called 'koan' that integrates with cobbler. Cobbler's advanced features include importing distributions from DVDs and rsync mirrors, kickstart templating, integrated yum mirroring, and built-in DHCP/DNS Management. Cobbler also has a Python and XMLRPC API for integration with other applications. |