summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2009-08-12 12:23:10 -0400
committerBill Peck <bpeck@redhat.com>2009-08-12 12:23:10 -0400
commit362b1c679fb73e512ba8042e7539aba62933295a (patch)
treee34a21b146c7edd6ea4cf40173401c2ae67c63d4
parentb6432cacae7fa435b8c1a06f1f40bcfb5c3370c2 (diff)
0.4.37-0 escape $ in custom kickstarts before sending to cobblerbeaker-0_4_37
-rw-r--r--Server/beaker/server/model.py2
-rw-r--r--beaker.spec4
2 files changed, 5 insertions, 1 deletions
diff --git a/Server/beaker/server/model.py b/Server/beaker/server/model.py
index e1308dd..9064e40 100644
--- a/Server/beaker/server/model.py
+++ b/Server/beaker/server/model.py
@@ -1070,6 +1070,8 @@ class System(SystemObject):
remote.modify_system(system_id, 'kopts', kernel_options, token)
remote.modify_system(system_id, 'kopts_post', kernel_options_post, token)
if kickstart:
+ # Escape any $ signs or cobbler will barf
+ kickstart = kickstart.replace('$','\$')
# Fill in basic requirements for RHTS
kicktemplate = """
url --url=$tree
diff --git a/beaker.spec b/beaker.spec
index 1f827d2..5f8bd4f 100644
--- a/beaker.spec
+++ b/beaker.spec
@@ -2,7 +2,7 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: beaker
-Version: 0.4.36
+Version: 0.4.37
Release: 0%{?dist}
Summary: Filesystem layout for Beaker
Group: Applications/Internet
@@ -133,6 +133,8 @@ ln -s Fedora.ks $RPM_BUILD_ROOT/var/lib/cobbler/kickstarts/Fedoradevelopment.ks
/usr/share/man/man1/beakerlib*
%changelog
+* Wed Aug 12 2009 Bill Peck <bpeck@redhat.com> - 0.4.37-0
+- Escape $ in custom kickstarts sent to cobbler
* Tue Aug 11 2009 Bill Peck <bpeck@redhat.com> - 0.4.36-0
- create subprofile
* Mon Aug 10 2009 Bill Peck <bpeck@redhat.com> - 0.4.34-0