aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpietro <pietro@riseup.net>2009-05-08 03:33:34 -0700
committerpietro <pietro@riseup.net>2009-05-08 03:33:34 -0700
commit27309e37999ea7ba1f13be8430e9e121a17b77b5 (patch)
tree0cfe59ceece33828df88e218e47c309a19ffdb26
parent8aed34d6c121b99f57694f90f23e4c95a92901da (diff)
downloadpuppet-virtual-27309e37999ea7ba1f13be8430e9e121a17b77b5.tar.gz
puppet-virtual-27309e37999ea7ba1f13be8430e9e121a17b77b5.tar.bz2
fix typo and use different mirror if box not in colo
-rw-r--r--templates/xen-tools.conf7
1 files changed, 5 insertions, 2 deletions
diff --git a/templates/xen-tools.conf b/templates/xen-tools.conf
index 6f5a4f9..c3999ad 100644
--- a/templates/xen-tools.conf
+++ b/templates/xen-tools.conf
@@ -52,7 +52,7 @@
# LVM volume group here instead
#
##
-lvm = <% real_xen_lvm -%>
+lvm = <%= real_xen_lvm -%>
#
@@ -211,8 +211,11 @@ initrd = /boot/initrd.img-`uname -r`
#
# The default mirror for debootstrap to install Debian-derived distributions
#
+<% if in_colo == "no" -%>
+mirror = http://ftp.us.debian.org/debian/
+<% else -%>
mirror = http://macaw.riseup.net:9999/debian/
-
+<% end %>
#
# A mirror suitable for use when installing the Dapper release of Ubuntu.
#