From 664c93e509a68dfbd904cf2ee109500a15091d59 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 19 Nov 2016 17:57:11 +0100 Subject: [PATCH] Cleaning up preseed files. --- .../templates/preseed/client-trusty.seed | 16 ++++++++------ .../templates/preseed/dev/client-trusty.seed | 18 ++++++++------- .../templates/preseed/dev/docenti-trusty.seed | 18 ++++++++------- .../templates/preseed/docenti-trusty.seed | 22 ++++++++----------- roles/preseed/templates/preseed/edubuntu.seed | 14 ++++++------ roles/pxe/tasks/pxe.yml | 12 +++++----- 6 files changed, 51 insertions(+), 49 deletions(-) diff --git a/roles/preseed/templates/preseed/client-trusty.seed b/roles/preseed/templates/preseed/client-trusty.seed index ff62c06..d94a2f8 100644 --- a/roles/preseed/templates/preseed/client-trusty.seed +++ b/roles/preseed/templates/preseed/client-trusty.seed @@ -25,18 +25,19 @@ 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/extras boolean false -d-i apt-setup/restricted boolean true -d-i apt-setup/universe boolean true -d-i apt-setup/backports boolean true -d-i apt-setup/non-free boolean true -d-i apt-setup/contrib boolean true d-i apt-setup/services-select multiselect security, updates 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/universe boolean true +d-i apt-setup/restricted boolean true +d-i apt-setup/partner boolean true + # Setup and enable libreoffice PPA d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA @@ -74,6 +75,7 @@ d-i user-setup/encrypt-home boolean false # Kernel installation d-i base-installer/kernel/image string linux-generic +d-i base-installer/kernel/altmeta string lts-xenial # Install the Edubuntu desktop. tasksel tasksel/first multiselect edubuntu-desktop-gnome @@ -87,7 +89,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 diff --git a/roles/preseed/templates/preseed/dev/client-trusty.seed b/roles/preseed/templates/preseed/dev/client-trusty.seed index f291c12..13b9ff8 100644 --- a/roles/preseed/templates/preseed/dev/client-trusty.seed +++ b/roles/preseed/templates/preseed/dev/client-trusty.seed @@ -25,18 +25,19 @@ 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/extras boolean false -d-i apt-setup/restricted boolean true -d-i apt-setup/universe boolean true -d-i apt-setup/backports boolean true -d-i apt-setup/non-free boolean true -d-i apt-setup/contrib boolean true d-i apt-setup/services-select multiselect security, updates 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/universe boolean true +d-i apt-setup/restricted boolean true +d-i apt-setup/partner boolean true + # Setup and enable libreoffice PPA d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA @@ -56,7 +57,7 @@ d-i clock-setup/ntp-server string {{ ansible_local.domain.ntpserver }} # User creation d-i passwd/user-fullname string BgLUG User d-i passwd/username string bglug -d-i passwd/user-password-crypted string $1$33bB/LIt$MEHmvzVIgYRJs/5L4z34L/ +d-i passwd/user-password-crypted password $6$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./ # Partitioning d-i partman-auto/init_automatically_partition select biggest_free @@ -74,6 +75,7 @@ d-i user-setup/encrypt-home boolean false # Kernel installation d-i base-installer/kernel/image string linux-generic +d-i base-installer/kernel/altmeta string lts-xenial # Install the Edubuntu desktop. tasksel tasksel/first multiselect edubuntu-desktop-gnome @@ -87,7 +89,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 diff --git a/roles/preseed/templates/preseed/dev/docenti-trusty.seed b/roles/preseed/templates/preseed/dev/docenti-trusty.seed index 9994106..b957912 100644 --- a/roles/preseed/templates/preseed/dev/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/dev/docenti-trusty.seed @@ -25,18 +25,19 @@ 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/extras boolean false -d-i apt-setup/restricted boolean true -d-i apt-setup/universe boolean true -d-i apt-setup/backports boolean true -d-i apt-setup/non-free boolean true -d-i apt-setup/contrib boolean true d-i apt-setup/services-select multiselect security, updates 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/universe boolean true +d-i apt-setup/restricted boolean true +d-i apt-setup/partner boolean true + # Setup and enable libreoffice PPA d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA @@ -56,7 +57,7 @@ d-i clock-setup/ntp-server string {{ ansible_local.domain.ntpserver }} # User creation d-i passwd/user-fullname string BgLUG User d-i passwd/username string bglug -d-i passwd/user-password-crypted string $1$33bB/LIt$MEHmvzVIgYRJs/5L4z34L/ +d-i passwd/user-password-crypted password $6$S8u22loyR$RJZUtmnqmadvas13BxjPkBjdcF1o6P0xGtweZ9MkUCKIbyzmzQFxvwPTwoX1AaPgRyNmvdevyUgs/AMRGH8O./ # Partitioning d-i partman-auto/init_automatically_partition select biggest_free @@ -74,6 +75,7 @@ d-i user-setup/encrypt-home boolean false # Kernel installation d-i base-installer/kernel/image string linux-generic +d-i base-installer/kernel/altmeta lts-xenial # Install the Edubuntu desktop. tasksel tasksel/first multiselect edubuntu-desktop-gnome @@ -87,7 +89,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 diff --git a/roles/preseed/templates/preseed/docenti-trusty.seed b/roles/preseed/templates/preseed/docenti-trusty.seed index 482d03a..fd39432 100644 --- a/roles/preseed/templates/preseed/docenti-trusty.seed +++ b/roles/preseed/templates/preseed/docenti-trusty.seed @@ -16,27 +16,22 @@ 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/extras boolean false -d-i apt-setup/restricted boolean true -d-i apt-setup/universe boolean true -d-i apt-setup/backports boolean true -d-i apt-setup/non-free boolean true -d-i apt-setup/contrib boolean true d-i apt-setup/services-select multiselect security, updates 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/universe boolean true +d-i apt-setup/restricted boolean true +d-i apt-setup/partner boolean true + # Setup and enable libreoffice PPA d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA @@ -74,6 +69,7 @@ d-i user-setup/encrypt-home boolean false # Kernel installation d-i base-installer/kernel/image string linux-generic +d-i base-installer/kernel/altmeta string lts-xenial # Install the Edubuntu desktop. tasksel tasksel/first multiselect edubuntu-desktop-gnome @@ -87,7 +83,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 diff --git a/roles/preseed/templates/preseed/edubuntu.seed b/roles/preseed/templates/preseed/edubuntu.seed index c0dd76c..004d8cf 100644 --- a/roles/preseed/templates/preseed/edubuntu.seed +++ b/roles/preseed/templates/preseed/edubuntu.seed @@ -28,16 +28,15 @@ d-i mirror/http/proxy string d-i mirror/suite string trusty # Apt-setup additional repos -d-i apt-setup/extras boolean true -d-i apt-setup/restricted boolean true -d-i apt-setup/universe boolean true -d-i apt-setup/backports boolean true -d-i apt-setup/non-free boolean true -d-i apt-setup/contrib boolean true d-i apt-setup/services-select multiselect security, updates 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/restricted boolean true +d-i apt-setup/universe boolean true +d-i apt-setup/multiverse boolean true + # Setup and enable libreoffice PPA d-i apt-setup/local0/repository string http://{{ execpath }}ppa.launchpad.net/libreoffice/ppa/ubuntu trusty main d-i apt-setup/local0/comment string LibreOffice Official PPA @@ -70,6 +69,7 @@ d-i user-setup/encrypt-home boolean false # Kernel installation d-i base-installer/kernel/image string linux-generic +d-i base-installer/kernel/altmeta string lts-xenial # Install the Edubuntu desktop. tasksel tasksel/first multiselect edubuntu-desktop-gnome @@ -83,7 +83,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 diff --git a/roles/pxe/tasks/pxe.yml b/roles/pxe/tasks/pxe.yml index d907cb7..c4789a4 100644 --- a/roles/pxe/tasks/pxe.yml +++ b/roles/pxe/tasks/pxe.yml @@ -13,7 +13,7 @@ - name: pxelinux.0 get_url: - url: "http://archive.ubuntu.com/ubuntu/dists/trusty/main/installer-i386/current/images/netboot/pxelinux.0" + url: "http://archive.ubuntu.com/ubuntu/dists/trusty-updates/main/installer-amd64/current/images/utopic-netboot/pxelinux.0" dest: /var/lib/tftpboot/pxelinux.0 - name: pxelinux.cfg/default @@ -35,7 +35,7 @@ - name: vesamenu.c32 get_url: - url: "http://archive.ubuntu.com/ubuntu/dists/trusty/main/installer-i386/current/images/netboot/ubuntu-installer/i386/boot-screens/vesamenu.c32" + url: "http://archive.ubuntu.com/ubuntu/dists/trusty-updates/main/installer-i386/current/images/netboot/ubuntu-installer/i386/boot-screens/vesamenu.c32" dest: /var/lib/tftpboot/utils/vesamenu.c32 - name: chain.c32 @@ -45,22 +45,22 @@ - name: linux i386 get_url: - url: "http://archive.ubuntu.com/ubuntu/dists/trusty/main/installer-i386/current/images/netboot/ubuntu-installer/i386/linux" + url: "http://archive.ubuntu.com/ubuntu/dists/trusty-updates/main/installer-i386/current/images/netboot/ubuntu-installer/i386/linux" dest: /var/lib/tftpboot/ubuntu/14.04/i386/linux - name: initrd.gz i386 get_url: - url: "http://archive.ubuntu.com/ubuntu/dists/trusty/main/installer-i386/current/images/netboot/ubuntu-installer/i386/initrd.gz" + url: "http://archive.ubuntu.com/ubuntu/dists/trusty-updates/main/installer-i386/current/images/netboot/ubuntu-installer/i386/initrd.gz" dest: /var/lib/tftpboot/ubuntu/14.04/i386/initrd.gz - name: linux amd64 get_url: - url: "http://archive.ubuntu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/linux" + url: "http://archive.ubuntu.com/ubuntu/dists/trusty-updates/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/linux" dest: /var/lib/tftpboot/ubuntu/14.04/amd64/linux - name: initrd.gz amd64 get_url: - url: "http://archive.ubuntu.com/ubuntu/dists/trusty/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/initrd.gz" + url: "http://archive.ubuntu.com/ubuntu/dists/trusty-updates/main/installer-amd64/current/images/netboot/ubuntu-installer/amd64/initrd.gz" dest: /var/lib/tftpboot/ubuntu/14.04/amd64/initrd.gz - name: memdisk