From f0f241321451fb502bc377352ca038906f956913 Mon Sep 17 00:00:00 2001
From: Emiliano Vavassori <syntaxerrormmm@gmail.com>
Date: Sun, 22 Jan 2017 22:36:30 +0100
Subject: [PATCH] Fixing errors within preseed files. Partially fixing issue
 #2.

---
 roles/preseed/templates/preseed/aula-trusty.seed    | 10 +++++-----
 roles/preseed/templates/preseed/client-trusty.seed  |  7 +++----
 roles/preseed/templates/preseed/docenti-trusty.seed | 13 +++++++++----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/roles/preseed/templates/preseed/aula-trusty.seed b/roles/preseed/templates/preseed/aula-trusty.seed
index 9db278d..c9fb228 100644
--- a/roles/preseed/templates/preseed/aula-trusty.seed
+++ b/roles/preseed/templates/preseed/aula-trusty.seed
@@ -32,7 +32,7 @@ d-i	apt-setup/security_host			string {{ mirror_security_host }}
 d-i	apt-setup/security_path			string {{ mirror_security_path }}
 
 # Additional repos
-d-i 	apt-setup/multiverse			boolean true
+d-i	apt-setup/multiverse			boolean true
 d-i	apt-setup/universe			boolean true
 d-i	apt-setup/restricted			boolean true
 d-i	apt-setup/partner			boolean true
@@ -88,7 +88,7 @@ d-i	localechooser/translation/warn-light	boolean true
 # Policy to upgrade: none
 d-i	pkgsel/update-policy			select none
 
-# UPgrade after installation: no
+# Upgrade after installation: no
 d-i	pkgsel/upgrade				select none
 
 # Language pack selection
@@ -102,16 +102,16 @@ d-i	pkgsel/language-pack-patterns		string language-pack-gnome-$LL language-pack-
 
 # Adding libreoffice and ansible
 {% if ansible_bios_version == 'VirtualBox' %}
-d-i	pkgsel/include				string dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude virtualbox-guest-dkms
+d-i	pkgsel/include				string dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude geogebra geogebra-gnome gnome-search-tool ocrfeeder openshot freeplane gtk-recordmydesktop vokoscreen virtualbox-guest-dkms
 {% else %}
-d-i	pkgsel/include				string dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude
+d-i	pkgsel/include				string dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude geogebra geogebra-gnome gnome-search-tool ocrfeeder openshot freeplane gtk-recordmydesktop vokoscreen
 {% endif %}
 
 # Post installation tasks
 # Update system
 d-i 	preseed/late_command string in-target apt-get -y upgrade; \
 	in-target apt-get -y dist-upgrade; \
-	in-target apt-get -y purge unity-webapps-common zeitgeist-core zeitgeist-datahub epoptes epoptes-client; \
+	in-target apt-get -y purge unity-webapps-common zeitgeist-core zeitgeist-datahub webbrowser-app epoptes epoptes-client; \
 	in-target apt-get -y autoremove; \
 	sed -i'' -e 's/ubuntu/gnome-fallback/g' /target/usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf; \
 	in-target bash -c "/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/postseed-aula.sh | /bin/bash >/root/postseed.log 2>&1";
diff --git a/roles/preseed/templates/preseed/client-trusty.seed b/roles/preseed/templates/preseed/client-trusty.seed
index d94a2f8..05ca3d8 100644
--- a/roles/preseed/templates/preseed/client-trusty.seed
+++ b/roles/preseed/templates/preseed/client-trusty.seed
@@ -25,7 +25,6 @@ d-i	mirror/http/hostname			string {{ mirror_host }}
 d-i	mirror/http/directory			string {{ mirror_path }}
 d-i	mirror/http/proxy 			string
 d-i	mirror/suite				string trusty
-d-i 	mirror/udeb/components			multiselect main, restricted, universe, multiverse
 
 # Apt-setup additional repos
 d-i	apt-setup/services-select 		multiselect security, updates
@@ -103,16 +102,16 @@ d-i	pkgsel/language-pack-patterns		string language-pack-gnome-$LL language-pack-
 
 # Adding libreoffice and ansible
 {% if ansible_bios_version == 'VirtualBox' %}
-d-i	pkgsel/include				string epoptes-client dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude virtualbox-guest-dkms
+d-i	pkgsel/include				string epoptes-client dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude geogebra geogebra-gnome gnome-search-tool ocrfeeder openshot freeplane gtk-recordmydesktop vokoscreen virtualbox-guest-dkms
 {% else %}
-d-i	pkgsel/include				string epoptes-client dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude
+d-i	pkgsel/include				string epoptes-client dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude geogebra geogebra-gnome gnome-search-tool ocrfeeder openshot freeplane gtk-recordmydesktop vokoscreen
 {% endif %}
 
 # Post installation tasks
 # Update system
 d-i 	preseed/late_command string in-target apt-get -y upgrade; \
 	in-target apt-get -y dist-upgrade; \
-	in-target apt-get -y purge unity-webapps-common zeitgeist-core zeitgeist-datahub epoptes; \
+	in-target apt-get -y purge unity-webapps-common zeitgeist-core zeitgeist-datahub webbrowser-app epoptes; \
 	in-target apt-get -y autoremove; \
 	sed -i'' -e 's/ubuntu/gnome-fallback/g' /target/usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf; \
 	in-target /bin/bash -c "/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/postseed-client.sh | /bin/bash >/root/postseed.log 2>&1";
diff --git a/roles/preseed/templates/preseed/docenti-trusty.seed b/roles/preseed/templates/preseed/docenti-trusty.seed
index fd39432..6c3175c 100644
--- a/roles/preseed/templates/preseed/docenti-trusty.seed
+++ b/roles/preseed/templates/preseed/docenti-trusty.seed
@@ -16,10 +16,15 @@ d-i	netcfg/choose_interface 		select auto
 d-i 	netcfg/hostname				string kickseed
 
 # Enabling non-free firmware
+d-i	hw-detect/load_firmware			boolean true
+
+# Setting up repositories from local mirror
+d-i	mirror/country				string manual
+d-i	mirror/protocol				string http
+d-i	mirror/http/hostname			string {{ mirror_host }}
 d-i	mirror/http/directory			string {{ mirror_path }}
 d-i	mirror/http/proxy 			string
 d-i	mirror/suite				string trusty
-d-i	mirror/udeb/components			multiselect main, restricted, universe, multiverse
 
 # Apt-setup additional repos
 d-i	apt-setup/services-select 		multiselect security, updates
@@ -97,16 +102,16 @@ d-i	pkgsel/language-pack-patterns		string language-pack-gnome-$LL language-pack-
 
 # Adding libreoffice and ansible
 {% if ansible_bios_version == 'VirtualBox' %}
-d-i	pkgsel/include				string epoptes dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude virtualbox-guest-dkms
+d-i	pkgsel/include				string epoptes dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude geogebra geogebra-gnome gnome-search-tool ocrfeeder openshot freeplane gtk-recordmydesktop vokoscreen virtualbox-guest-dkms
 {% else %}
-d-i	pkgsel/include				string epoptes dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude
+d-i	pkgsel/include				string epoptes dialog vim screen cifs-utils curl git openssh-server software-properties-common sshpass ubuntu-edu-{{ edu_package }} python3-uno libreoffice ansible libnss-myhostname sysv-rc-conf unattended-upgrades update-notifier-common aptitude geogebra geogebra-gnome gnome-search-tool ocrfeeder openshot freeplane gtk-recordmydesktop vokoscreen
 {% endif %}
 
 # Post installation tasks
 # Update system
 d-i 	preseed/late_command string in-target apt-get -y upgrade; \
 	in-target apt-get -y dist-upgrade; \
-	in-target apt-get -y purge unity-webapps-common zeitgeist-core zeitgeist-datahub epoptes-client; \
+	in-target apt-get -y purge unity-webapps-common zeitgeist-core zeitgeist-datahub webbrowser-app epoptes-client; \
 	in-target apt-get -y autoremove; \
 	sed -i'' -e 's/ubuntu/gnome-fallback/g' /target/usr/share/lightdm/lightdm.conf.d/50-ubuntu.conf; \
 	in-target bash -c "/usr/bin/curl -sSL4 http://{{ ansible_local.domain.serverfqdn }}/ks/preseed/postseed-docenti.sh | /bin/bash >/root/postseed.log 2>&1";