Cobbler now assigns a default.ks file (which is by default blank) to

all profiles created without a kickstart file.  This allows kickstarts
to be auto-assigned during import if the kickstart guessing code fails, and
usually an admin can (if desired) create a good default kickstart.  To avoid
making the wrong decisions about hard drives, the default.ks file is
originally blank.

6 files changed, 15 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index ee614f0..9705127 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Cobbler CHANGELOG
 
 * Tue Oct 24 2006 - 0.3.0-1
 - Reload httpd during sync
+- New profiles without set kickstarts default to /etc/cobbler/default.ks
 
 * Tue Oct 24 2006 - 0.2.9-1
 - Bug fix, enchant now detects if koan_path is not set
diff --git a/MANIFEST.in b/MANIFEST.in
index 8302ab7..d18b423 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,5 +2,6 @@ include COPYING_ELILO
 include elilo-3.6-ia64.efi
 include dhcp.template
 include kickstart_fc5.ks
+include default.ks
 include cobbler.1.gz
 include COPYING AUTHORS README CHANGELOG NEWS
diff --git a/cobbler.spec b/cobbler.spec
index cd27bd3..42b08a5 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -2,7 +2,7 @@
 
 Summary: Boot server configurator
 Name: cobbler
-Version: 0.2.9
+Version: 0.3.0
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -39,8 +39,9 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_bindir}/cobbler
 %dir /etc/cobbler
-/etc/cobbler/*.ks
-/etc/cobbler/dhcp.template
+%config(noreplace) /etc/cobbler/default.ks
+%config(noreplace) /etc/cobbler/kickstart_fc5.ks
+%config(noreplace) /etc/cobbler/dhcp.template
 %dir %{python_sitelib}/cobbler
 %dir %{python_sitelib}/cobbler/yaml
 %{python_sitelib}/cobbler/*.py*
@@ -54,7 +55,12 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
-* Tue Oct 29 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.9-1
+* Tue Oct 24 2006 Michael DeHaan <mdehaan@redhat.com> - 0.3.0-1
+- Upstream changes (see CHANGELOG)
+- Marked files in /etc/cobbler as config
+- Marked /etc/cobbler/dhcpd.template as noreplace 
+
+* Tue Oct 24 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.9-1
 - Upstream changes (see CHANGELOG)
 
 * Wed Oct 18 2006 Michael DeHaan <mdehaan@redhat.com> - 0.2.8-1
diff --git a/cobbler/item_profile.py b/cobbler/item_profile.py
index 9b9edc5..692e35f 100644
--- a/cobbler/item_profile.py
+++ b/cobbler/item_profile.py
@@ -31,7 +31,7 @@ class Profile(item.Item):
         """
         self.name = None
         self.distro = None # a name, not a reference
-        self.kickstart = None
+        self.kickstart = "/etc/cobbler/default.ks"
         self.kernel_options = ''
         self.ks_meta = ''
         self.xen_name = 'xenguest'
diff --git a/default.ks b/default.ks
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/default.ks
diff --git a/setup.py b/setup.py
index b499d31..d8bf165 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ import sys
 from distutils.core import setup, Extension
 import string
 
-VERSION = "0.2.9"
+VERSION = "0.3.0"
 SHORT_DESC = "Boot server configurator"
 LONG_DESC = """
 Cobbler is a command line tool for simplified configuration of boot/provisioning servers.  It is also accessible as a Python library.  Cobbler supports PXE, Xen, and re-provisioning an existing Linux system via auto-kickstart.  The last two modes require 'koan' to be run on the remote system.
@@ -31,6 +31,7 @@ if __name__ == "__main__":
                                 (wwwpath, []),
                                 (cobpath, ['elilo-3.6-ia64.efi']),
                                 (etcpath, ['kickstart_fc5.ks']),
+                                (etcpath, ['default.ks']),
 				(etcpath, ['dhcp.template']),
                                 (manpath, ['cobbler.1.gz'])
                              ],