Update to code on trunk.

4 files changed, 67 insertions, 0 deletions

diff --git a/templates/hosts.ubuntu.tmpl b/templates/hosts.debian.tmpl
index ae120b02..ae120b02 100644
--- a/templates/hosts.ubuntu.tmpl
+++ b/templates/hosts.debian.tmpl
diff --git a/templates/resolv.conf.tmpl b/templates/resolv.conf.tmpl
new file mode 100644
index 00000000..b7e97b13
--- /dev/null
+++ b/templates/resolv.conf.tmpl
@@ -0,0 +1,39 @@
+#
+# Your system has been configured with 'manage-resolv-conf' set to true.
+# As a result, cloud-init has written this file with configuration data
+# that it has been provided. Cloud-init, by default, will write this file
+# a single time (PER_ONCE).
+#
+
+#if $varExists('nameservers')
+#for $server in $nameservers
+nameserver $server
+#end for
+#end if
+#if $varExists('searchdomains')
+search #slurp
+#for $search in $searchdomains
+$search #slurp
+#end for
+
+#end if
+#if $varExists('domain')
+domain $domain
+#end if
+#if $varExists('sortlist')
+sortlist #slurp
+#for $sort in $sortlist
+$sort #slurp
+#end for
+
+#end if
+#if $varExists('options') or $varExists('flags')
+options #slurp
+#for $flag in $flags
+$flag #slurp
+#end for
+#for $key, $value in $options.items()
+$key:$value #slurp
+#end for
+
+#end if
diff --git a/templates/sources.list.debian.tmpl b/templates/sources.list.debian.tmpl
new file mode 100644
index 00000000..609bc6bd
--- /dev/null
+++ b/templates/sources.list.debian.tmpl
@@ -0,0 +1,28 @@
+\## Note, this file is written by cloud-init on first boot of an instance
+\## modifications made here will not survive a re-bundle.
+\## if you wish to make changes you can:
+\## a.) add 'apt_preserve_sources_list: true' to /etc/cloud/cloud.cfg
+\##     or do the same in user-data
+\## b.) add sources in /etc/apt/sources.list.d
+\## c.) make changes to template file /etc/cloud/templates/sources.list.debian.tmpl
+\###
+
+# See http://www.debian.org/releases/stable/i386/release-notes/ch-upgrading.html
+# for how to upgrade to newer versions of the distribution.
+deb $mirror $codename main contrib non-free
+deb-src $mirror $codename main contrib non-free
+
+\## Major bug fix updates produced after the final release of the
+\## distribution.
+deb $security $codename/updates main contrib non-free
+deb-src $security $codename/updates main contrib non-free
+deb $mirror $codename-updates main contrib non-free
+deb-src $mirror $codename-updates main contrib non-free
+
+\## Uncomment the following two lines to add software from the 'backports'
+\## repository.
+\## N.B. software from this repository may not have been tested as
+\## extensively as that contained in the main release, although it includes
+\## newer versions of some applications which may provide useful features.
+# deb http://backports.debian.org/debian-backports $codename-backports main contrib non-free
+# deb-src http://backports.debian.org/debian-backports $codename-backports main contrib non-free
diff --git a/templates/sources.list.tmpl b/templates/sources.list.ubuntu.tmpl
index ce395b3d..ce395b3d 100644
--- a/templates/sources.list.tmpl
+++ b/templates/sources.list.ubuntu.tmpl