Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/215929

Change subject: autoinstall: Set default task for tasksel
......................................................................

autoinstall: Set default task for tasksel

The multiselect empty string never worked as a setting as pointed out in
Ib374d4a7d74. That meant we would always get the default tasks for non
desktop environments which are server, ssh-server on Ubuntu, standard,
ssh-server on Debian. Set a default of standard now and override it for
Ubuntu installation to server. We do not use ssh-server explicitly as it
anyway happens in late_command and we follow DRY.

Change-Id: I830a3ee183e32de4f6e1218b1438fee149b326c7
---
M modules/install-server/files/autoinstall/common.cfg
M modules/install-server/files/autoinstall/trusty.cfg
2 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/215929/1

diff --git a/modules/install-server/files/autoinstall/common.cfg 
b/modules/install-server/files/autoinstall/common.cfg
index 0b819e1..1556f8e 100644
--- a/modules/install-server/files/autoinstall/common.cfg
+++ b/modules/install-server/files/autoinstall/common.cfg
@@ -44,7 +44,7 @@
 d-i    base-installer/install-recommends       boolean false
 
 # Tasksel - do not install anything
-tasksel        tasksel/first   multiselect
+tasksel        tasksel/first   multiselect standard
 
 # disable multiarch, enabled by default in Ubuntu amd64 since saucy
 d-i    apt-setup/multiarch     string
diff --git a/modules/install-server/files/autoinstall/trusty.cfg 
b/modules/install-server/files/autoinstall/trusty.cfg
index 4c3f255..cfb1da9 100644
--- a/modules/install-server/files/autoinstall/trusty.cfg
+++ b/modules/install-server/files/autoinstall/trusty.cfg
@@ -11,3 +11,6 @@
 d-i     base-installer/kernel/override-image    string  linux-server
 
 d-i    debian-installer/add-kernel-opts        string  elevator=deadline 
rootdelay=90
+
+# Override the default task for tasksel
+tasksel        tasksel/first   multiselect server

-- 
To view, visit https://gerrit.wikimedia.org/r/215929
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I830a3ee183e32de4f6e1218b1438fee149b326c7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to