updated templates/Debian-jessie.beta1-amd64-netboot

3 files changed, 17 insertions, 4 deletions

diff --git a/templates/Debian-jessie.beta1-amd64-netboot/definition.rb b/templates/Debian-jessie.beta1-amd64-netboot/definition.rb
index d4134b5..0ca47be 100644
--- a/templates/Debian-jessie.beta1-amd64-netboot/definition.rb
+++ b/templates/Debian-jessie.beta1-amd64-netboot/definition.rb
@@ -39,12 +39,13 @@ Veewee::Definition.declare({
   :shutdown_cmd => "halt -p",
   :postinstall_files => [
     "base.sh",
+    "leap.sh",
     "vagrant.sh",
     "virtualbox.sh",
     #"vmfusion.sh",
-    "ruby.sh",
-    "puppet.sh",
-    "chef.sh",
+    #"ruby.sh",
+    #"puppet.sh",
+    #"chef.sh",
     "cleanup.sh",
     "zerodisk.sh"
   ],
diff --git a/templates/Debian-jessie.beta1-amd64-netboot/leap.sh b/templates/Debian-jessie.beta1-amd64-netboot/leap.sh
new file mode 100644
index 0000000..82f64bd
--- /dev/null
+++ b/templates/Debian-jessie.beta1-amd64-netboot/leap.sh
@@ -0,0 +1,11 @@
+# prerequisites for instlling the leap_platform
+# see https://leap.se/en/platform
+
+date > /etc/box_build_time
+
+# Before updating the box, get rid of pdiffs, they slow things down on faster links
+#echo 'Acquire::PDiffs "false";' >/etc/apt/apt.conf.d/90disable-pdiffs
+
+apt-get -y dist-upgrade
+apt-get clean
+
diff --git a/templates/Debian-jessie.beta1-amd64-netboot/preseed.cfg b/templates/Debian-jessie.beta1-amd64-netboot/preseed.cfg
index 97d0076..0cf5001 100644
--- a/templates/Debian-jessie.beta1-amd64-netboot/preseed.cfg
+++ b/templates/Debian-jessie.beta1-amd64-netboot/preseed.cfg
@@ -220,7 +220,8 @@ tasksel tasksel/first multiselect standard
 #tasksel tasksel/desktop multiselect kde, xfce
 
 # Individual additional packages to install
-d-i pkgsel/include string openssh-server ntp acpid  sudo bzip2 rsync
+# ruby-hiera-puppet is deprecated, puppet-common replaces it
+d-i pkgsel/include string openssh-server ntp acpid sudo bzip2 rsync puppet lsb-release console-data
 
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade