debian_cloud_script.sh in comfy-0.2.7

- old
+ new

@@ -2,18 +2,39 @@
 ###########################################################
 #############INITIALIZATION SCRIPT FOR DEBIAN##############
 ######################CESNET CLOUD#########################
 ###########################################################
 
-mv /root/cerit-cloudinit.list /etc/apt/sources.list.d/cerit-cloudinit.list
+# make sure lsb_release is installed
+apt-get update
+apt-get --assume-yes upgrade
+apt-get --assume-yes install lsb-release
+
+#DEB8 doesn't need cerit and jessie repo
+if [[ $(lsb_release -rs) == 7.* ]]; then
+  mv /root/cerit-cloudinit.list /etc/apt/sources.list.d/cerit-cloudinit.list
+  mv /root/jessie.list /etc/apt/sources.list.d/jessie.list
+  mv /root/jessie_cloud_init.pref /etc/apt/preferences.d/jessie_cloud_init.pref
+  mv /root/depot_wheezy.list /etc/apt/sources.list.d/depot.list
+  rm /root/depot_jessie.list
+  mv /root/meta-misc_wheezy.list /etc/apt/sources.list.d/meta-misc.list
+  rm /root/meta-misc_jessie.list
+else
+  rm /root/jessie.list
+  rm /root/jessie_cloud_init.pref
+  rm /root/cerit-cloudinit.list
+  mv /root/depot_jessie.list /etc/apt/sources.list.d/depot.list
+  rm /root/depot_wheezy.list
+  mv /root/meta-misc_jessie.list /etc/apt/sources.list.d/meta-misc.list
+  rm /root/meta-misc_wheezy.list
+fi
+
 apt-key add /root/RPM-GPG-KEY-CERIT-SC.cfg
 rm -f /root/RPM-GPG-KEY-CERIT-SC.cfg
 apt-key add /root/DEPOT-GPG-KEY.cfg
 rm -f /root/DEPOT-GPG-KEY.cfg
 mv /root/backports.list /etc/apt/sources.list.d/backports.list
-mv /root/meta-misc.list /etc/apt/sources.list.d/meta-misc.list
-mv /root/depot.list /etc/apt/sources.list.d/depot.list
 mv /root/depot_all.pref /etc/apt/preferences.d/depot_all.pref
 mv /root/depot_check_mk.pref /etc/apt/preferences.d/depot_check_mk.pref
 
 apt-get update
 apt-get --assume-yes upgrade
@@ -22,12 +43,12 @@
 apt-get --assume-yes install cloud-init
 apt-get --assume-yes install qemu-guest-agent
 apt-get --assume-yes install fail2ban ntp
 DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" heimdal-clients libpam-heimdal
 apt-get --assume-yes install vim git
+apt-get --assume-yes install cloud-initramfs-growroot
 
-
 # Enable services
 if [[ $(lsb_release -rs) == 7.* ]]; then
   insserv cloud-init-local
   insserv cloud-init
   insserv cloud-config
@@ -37,15 +58,15 @@
   systemctl enable ntp
   systemctl enable cloud-init-local
   systemctl enable cloud-init
   systemctl enable cloud-config
   systemctl enable cloud-final
-  rm /etc/cloud/cloud.cfg.d/90_dpkg.cfg
   rm /etc/apt/sources.list.d/backports.list
   mv /root/getty\@ttyS0.service /etc/systemd/system/getty.target.wants/getty@ttyS0.service
   ln -s /etc/systemd/system/getty\@ttyS0.service /etc/systemd/system/getty.target.wants/getty@ttyS0.service
 fi
 
+rm /etc/cloud/cloud.cfg.d/90_dpkg.cfg
 mv /root/ntp.conf /etc/ntp.conf
 mv /root/cloud.cfg /etc/cloud/cloud.cfg
 mv /root/krb5.conf /etc/krb5.conf
 mv /root/sshd_config /etc/ssh/sshd_config
 mv /root/interfaces /etc/network/interfaces