summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@redhat.com>2007-11-29 14:48:20 -0500
committerMichael DeHaan <mdehaan@redhat.com>2007-11-29 14:48:20 -0500
commitbddd3d6affa106b800f9ad1ec25f0dcfed750604 (patch)
tree4a879d835f5d7a8c189863c8e7db4fdf18e17f9e
parente451ca8a9d28db9cd69542cd9a96e62cda686494 (diff)
downloadthird_party-cobbler-bddd3d6affa106b800f9ad1ec25f0dcfed750604.zip
third_party-cobbler-bddd3d6affa106b800f9ad1ec25f0dcfed750604.tar.gz
third_party-cobbler-bddd3d6affa106b800f9ad1ec25f0dcfed750604.tar.xz
Quote wget args to avoid creating stray files.
-rw-r--r--CHANGELOG3
-rw-r--r--cobbler/action_sync.py8
2 files changed, 7 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 70213f4..64fadf0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,9 @@ Cobbler CHANGELOG
* Thu Nov 15 2007 - 0.7.0
- Testing branch
- Fix bug related to <<inherit>> and kickstart args
+- Make CLI functions modular and use optparse
+- Quote wget args to avoid creating stray files on target system
+- Support Xen FV as virt type (requires F8+)
- ...
* Wed Nov 14 2007 - 0.6.4
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index ad4143d..f81c2cd 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -386,9 +386,9 @@ class BootSync:
# FIXME: watcher is more of a request than a packaged file
# we should eventually package something and let it do something important"
- pattern1 = "wget http://%s/cblr/watcher.py?%s_%s=%s -b"
- pattern2 = "wget http://%s/cgi-bin/cobbler/nopxe.cgi?system=%s -b"
- pattern3 = "wget http://%s/cobbler/%s/%s/ks.cfg -O /root/cobbler.ks"
+ pattern1 = "wget \"http://%s/cblr/watcher.py?%s_%s=%s\" -b"
+ pattern2 = "wget \"http://%s/cgi-bin/cobbler/nopxe.cgi?system=%s\" -b"
+ pattern3 = "wget \"http://%s/cobbler/%s/%s/ks.cfg\" -O /root/cobbler.ks"
blend_this = profile
if system:
@@ -500,7 +500,7 @@ class BootSync:
name = c.split("/")[-1].replace(".repo","")
# add the line to create the yum config file on the target box
conf = self.get_repo_config_file(blended["server"],urlseg,blended["name"],name)
- buf = buf + "wget %s --output-document=/etc/yum.repos.d/%s.repo\n" % (conf, name)
+ buf = buf + "wget \"%s\" --output-document=/etc/yum.repos.d/%s.repo\n" % (conf, name)
return buf