From 5eda0003d53002e3aeae28aa5a8fd8014927e746 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Fri, 4 Apr 2008 16:37:37 -0400 Subject: Apply dnsmasq change to master --- CHANGELOG | 3 ++- templates/dnsmasq.template | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 686ec3d..8fc74f4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,13 @@ Cobbler CHANGELOG (all entries mdehaan@redhat.com unless noted otherwise) -* Fri Feb 22 2008 - 0.8.3 +* Fri Mar 04 2008 - 0.8.3 - Make createrepo get run for local cobbler reposync invocations as needed - fix WebUI documentation URL - fix bug in /etc/cobbler/modules.conf regarding pluggable authn/z - fix default flags for yumdownloader - fix for RHEL 4u6 DVD/tree import x86_64 arch detection +- fix dnsmasq template to point at the correct hosts file * Fri Feb 22 2008 - 0.8.2 - fix to webui to allow repos to be edited there on profile page diff --git a/templates/dnsmasq.template b/templates/dnsmasq.template index 0646b71..28297d2 100644 --- a/templates/dnsmasq.template +++ b/templates/dnsmasq.template @@ -6,7 +6,7 @@ #no-poll #enable-dbus read-ethers -addn-hosts = /var/lib/cobbler/hosts_cobbler/ +addn-hosts = /var/lib/cobbler/cobbler_hosts dhcp-range=192.168.1.5,192.168.1.200 dhcp-option=3,$next_server -- cgit From 61b3219b3d72a151a3faa5d63dd2171d485c6d36 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Tue, 8 Apr 2008 11:44:09 -0400 Subject: Force names to be alphanumeric, update dates for release. --- CHANGELOG | 3 ++- cobbler.spec | 2 +- cobbler/item.py | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8fc74f4..c3ea738 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,13 +1,14 @@ Cobbler CHANGELOG (all entries mdehaan@redhat.com unless noted otherwise) -* Fri Mar 04 2008 - 0.8.3 +* Tue Apr 08 2008 - 0.8.3 - Make createrepo get run for local cobbler reposync invocations as needed - fix WebUI documentation URL - fix bug in /etc/cobbler/modules.conf regarding pluggable authn/z - fix default flags for yumdownloader - fix for RHEL 4u6 DVD/tree import x86_64 arch detection - fix dnsmasq template to point at the correct hosts file +- force all names to be alphanumeric * Fri Feb 22 2008 - 0.8.2 - fix to webui to allow repos to be edited there on profile page diff --git a/cobbler.spec b/cobbler.spec index e34e0da..911399a 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -190,7 +190,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog -* Mon Mar 10 2008 Michael DeHaan - 0.8.3-1 +* Tue Apr 08 2008 Michael DeHaan - 0.8.3-1 - Upstream changes (see CHANGELOG) * Fri Mar 07 2008 Michael DeHaan - 0.8.2-1 diff --git a/cobbler/item.py b/cobbler/item.py index dadcd23..db73820 100644 --- a/cobbler/item.py +++ b/cobbler/item.py @@ -114,6 +114,10 @@ class Item(serializable.Serializable): """ if self.name not in ["",None] and self.parent not in ["",None] and self.name == self.parent: raise CX(_("self parentage is weird")) + if type(name) != type(""): + raise CX(_("name must be a string")) + if not name.isalnum(): + raise CX(_("name must be alphanumeric")) self.name = name return True -- cgit From a124e7449fbc724637e45457905737883175d15f Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Tue, 8 Apr 2008 13:08:35 -0400 Subject: Checking in changes to make merge possible. --- cobbler/webui/master.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index b2abf09..6881059 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,8 +33,8 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0.1' __CHEETAH_versionTuple__ = (2, 0, 1, 'final', 0) -__CHEETAH_genTime__ = 1205174715.425076 -__CHEETAH_genTimestamp__ = 'Mon Mar 10 14:45:15 2008' +__CHEETAH_genTime__ = 1207674205.841289 +__CHEETAH_genTimestamp__ = 'Tue Apr 8 13:03:25 2008' __CHEETAH_src__ = 'webui_templates/master.tmpl' __CHEETAH_srcLastModified__ = 'Fri Feb 15 14:47:43 2008' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' -- cgit