Ubuntu Test Cases

Merge lp:~powersj/ubuntu-test-cases/fix-server-preseed into lp:ubuntu-test-cases/server

  1. fix-server-preseed
  2. Merge into server-tests-raring
Proposed by Joshua Powers
Status: Merged
Merge reported by: Joshua Powers
Merged at revision: not available
Proposed branch: lp:~powersj/ubuntu-test-cases/fix-server-preseed
Merge into: lp:ubuntu-test-cases/server
Diff against target: 267 lines (+22/-22)
22 files modified
preseeds/default.preseed (+1/-1)
preseeds/dns-server.preseed (+1/-1)
preseeds/lamp.preseed (+1/-1)
preseeds/lvm.preseed (+1/-1)
preseeds/mail-server.preseed (+1/-1)
preseeds/multi-lvm.preseed (+1/-1)
preseeds/openssh-server.preseed (+1/-1)
preseeds/postgresql-server.preseed (+1/-1)
preseeds/raid1.preseed (+1/-1)
preseeds/samba-server.preseed (+1/-1)
preseeds/templates/base (+1/-1)
preseeds/templates/dns-server (+1/-1)
preseeds/templates/lamp (+1/-1)
preseeds/templates/mail-server (+1/-1)
preseeds/templates/openssh-server (+1/-1)
preseeds/templates/postgresql-server (+1/-1)
preseeds/templates/print-server (+1/-1)
preseeds/templates/samba-server (+1/-1)
preseeds/templates/tomcat-server (+1/-1)
preseeds/templates/virtual-host (+1/-1)
preseeds/tomcat-server.preseed (+1/-1)
preseeds/virtual-host.preseed (+1/-1)
To merge this branch: bzr merge lp:~powersj/ubuntu-test-cases/fix-server-preseed
Reviewer Review Type Date Requested Status
Max Brustkern Pending
Review via email: mp+302352@code.launchpad.net

Description of the change

Fixes the preseed tasksel test issues due to the long name (e.g. Ubuntu server) vs. the short name (e.g. server) not being recognized.

To post a comment you must log in.
Revision history for this message
Max Brustkern (nuclearbob) wrote :

Makes sense to me.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'preseeds/default.preseed'
--- preseeds/default.preseed 2016-02-02 18:14:00 +0000
+++ preseeds/default.preseed 2016-08-08 23:27:28 +0000
@@ -244,7 +244,7 @@
244### Package selection244### Package selection
245245
246246
247tasksel tasksel/first multiselect Basic Ubuntu server247tasksel tasksel/first multiselect server
248248
249249
250250
251251
=== modified file 'preseeds/dns-server.preseed'
--- preseeds/dns-server.preseed 2016-02-02 18:11:57 +0000
+++ preseeds/dns-server.preseed 2016-08-08 23:27:28 +0000
@@ -244,7 +244,7 @@
244### Package selection244### Package selection
245245
246246
247tasksel tasksel/first multiselect Basic Ubuntu server, DNS server247tasksel tasksel/first multiselect server, dns-server
248248
249249
250250
251251
=== modified file 'preseeds/lamp.preseed'
--- preseeds/lamp.preseed 2016-02-02 18:11:57 +0000
+++ preseeds/lamp.preseed 2016-08-08 23:27:28 +0000
@@ -244,7 +244,7 @@
244### Package selection244### Package selection
245245
246246
247tasksel tasksel/first multiselect Basic Ubuntu server, LAMP server247tasksel tasksel/first multiselect server, lamp-server
248248
249249
250250
251251
=== modified file 'preseeds/lvm.preseed'
--- preseeds/lvm.preseed 2016-02-02 18:11:57 +0000
+++ preseeds/lvm.preseed 2016-08-08 23:27:28 +0000
@@ -243,7 +243,7 @@
243### Package selection243### Package selection
244244
245245
246tasksel tasksel/first multiselect Basic Ubuntu server246tasksel tasksel/first multiselect server
247247
248248
249249
250250
=== modified file 'preseeds/mail-server.preseed'
--- preseeds/mail-server.preseed 2016-02-02 18:11:57 +0000
+++ preseeds/mail-server.preseed 2016-08-08 23:27:28 +0000
@@ -244,7 +244,7 @@
244### Package selection244### Package selection
245245
246246
247tasksel tasksel/first multiselect Basic Ubuntu server, Mail server247tasksel tasksel/first multiselect server, mail-server
248248
249249
250250
251251
=== modified file 'preseeds/multi-lvm.preseed'
--- preseeds/multi-lvm.preseed 2016-02-02 18:11:57 +0000
+++ preseeds/multi-lvm.preseed 2016-08-08 23:27:28 +0000
@@ -244,7 +244,7 @@
244### Package selection244### Package selection
245245
246246
247tasksel tasksel/first multiselect Basic Ubuntu server247tasksel tasksel/first multiselect server
248248
249249
250250
251251
=== modified file 'preseeds/openssh-server.preseed'
--- preseeds/openssh-server.preseed 2016-02-02 18:11:57 +0000
+++ preseeds/openssh-server.preseed 2016-08-08 23:27:28 +0000
@@ -244,7 +244,7 @@
244### Package selection244### Package selection
245245
246246
247tasksel tasksel/first multiselect Basic Ubuntu server, OpenSSH server247tasksel tasksel/first multiselect server, openssh-server
248248
249249
250250
251251
=== modified file 'preseeds/postgresql-server.preseed'
--- preseeds/postgresql-server.preseed 2016-02-02 18:11:57 +0000
+++ preseeds/postgresql-server.preseed 2016-08-08 23:27:28 +0000
@@ -244,7 +244,7 @@
244### Package selection244### Package selection
245245
246246
247tasksel tasksel/first multiselect Basic Ubuntu server, PostgreSQL database247tasksel tasksel/first multiselect Basic server, postgresql-database
248248
249249
250250
251251
=== modified file 'preseeds/raid1.preseed'
--- preseeds/raid1.preseed 2016-02-02 18:11:57 +0000
+++ preseeds/raid1.preseed 2016-08-08 23:27:28 +0000
@@ -285,7 +285,7 @@
285### Package selection285### Package selection
286286
287287
288tasksel tasksel/first multiselect Basic Ubuntu server288tasksel tasksel/first multiselect server
289289
290290
291291
292292
=== modified file 'preseeds/samba-server.preseed'
--- preseeds/samba-server.preseed 2016-02-02 18:11:57 +0000
+++ preseeds/samba-server.preseed 2016-08-08 23:27:28 +0000
@@ -244,7 +244,7 @@
244### Package selection244### Package selection
245245
246246
247tasksel tasksel/first multiselect Basic Ubuntu server, Samba file server247tasksel tasksel/first multiselect server, samba-server
248248
249249
250250
251251
=== modified file 'preseeds/templates/base'
--- preseeds/templates/base 2016-01-19 20:28:15 +0000
+++ preseeds/templates/base 2016-08-08 23:27:28 +0000
@@ -227,7 +227,7 @@
227### Package selection227### Package selection
228228
229{% block tasksel_first %}229{% block tasksel_first %}
230tasksel tasksel/first multiselect Basic Ubuntu server230tasksel tasksel/first multiselect server
231{% endblock %}231{% endblock %}
232232
233{% block pkgsel_first %}233{% block pkgsel_first %}
234234
=== modified file 'preseeds/templates/dns-server'
--- preseeds/templates/dns-server 2012-08-29 15:47:42 +0000
+++ preseeds/templates/dns-server 2016-08-08 23:27:28 +0000
@@ -23,5 +23,5 @@
23d-i base-installer/kernel/override-image string linux-server23d-i base-installer/kernel/override-image string linux-server
24{% endblock %}24{% endblock %}
25{% block tasksel_first %}25{% block tasksel_first %}
26tasksel tasksel/first multiselect Basic Ubuntu server, DNS server26tasksel tasksel/first multiselect server, dns-server
27{% endblock %}27{% endblock %}
2828
=== modified file 'preseeds/templates/lamp'
--- preseeds/templates/lamp 2012-08-29 15:47:42 +0000
+++ preseeds/templates/lamp 2016-08-08 23:27:28 +0000
@@ -23,5 +23,5 @@
23d-i base-installer/kernel/override-image string linux-server23d-i base-installer/kernel/override-image string linux-server
24{% endblock %}24{% endblock %}
25{% block tasksel_first %}25{% block tasksel_first %}
26tasksel tasksel/first multiselect Basic Ubuntu server, LAMP server26tasksel tasksel/first multiselect server, lamp-server
27{% endblock %}27{% endblock %}
2828
=== modified file 'preseeds/templates/mail-server'
--- preseeds/templates/mail-server 2012-08-29 15:47:42 +0000
+++ preseeds/templates/mail-server 2016-08-08 23:27:28 +0000
@@ -23,5 +23,5 @@
23d-i base-installer/kernel/override-image string linux-server23d-i base-installer/kernel/override-image string linux-server
24{% endblock %}24{% endblock %}
25{% block tasksel_first %}25{% block tasksel_first %}
26tasksel tasksel/first multiselect Basic Ubuntu server, Mail server26tasksel tasksel/first multiselect server, mail-server
27{% endblock %}27{% endblock %}
2828
=== modified file 'preseeds/templates/openssh-server'
--- preseeds/templates/openssh-server 2012-08-29 15:47:42 +0000
+++ preseeds/templates/openssh-server 2016-08-08 23:27:28 +0000
@@ -23,5 +23,5 @@
23d-i base-installer/kernel/override-image string linux-server23d-i base-installer/kernel/override-image string linux-server
24{% endblock %}24{% endblock %}
25{% block tasksel_first %}25{% block tasksel_first %}
26tasksel tasksel/first multiselect Basic Ubuntu server, OpenSSH server26tasksel tasksel/first multiselect server, openssh-server
27{% endblock %}27{% endblock %}
2828
=== modified file 'preseeds/templates/postgresql-server'
--- preseeds/templates/postgresql-server 2012-08-29 15:47:42 +0000
+++ preseeds/templates/postgresql-server 2016-08-08 23:27:28 +0000
@@ -23,5 +23,5 @@
23d-i base-installer/kernel/override-image string linux-server23d-i base-installer/kernel/override-image string linux-server
24{% endblock %}24{% endblock %}
25{% block tasksel_first %}25{% block tasksel_first %}
26tasksel tasksel/first multiselect Basic Ubuntu server, PostgreSQL database26tasksel tasksel/first multiselect server, postgresql-databases
27{% endblock %}27{% endblock %}
2828
=== modified file 'preseeds/templates/print-server'
--- preseeds/templates/print-server 2012-08-29 15:47:42 +0000
+++ preseeds/templates/print-server 2016-08-08 23:27:28 +0000
@@ -23,5 +23,5 @@
23d-i base-installer/kernel/override-image string linux-server23d-i base-installer/kernel/override-image string linux-server
24{% endblock %}24{% endblock %}
25{% block tasksel_first %}25{% block tasksel_first %}
26tasksel tasksel/first multiselect Basic Ubuntu server, Print server26tasksel tasksel/first multiselect server, print-server
27{% endblock %}27{% endblock %}
2828
=== modified file 'preseeds/templates/samba-server'
--- preseeds/templates/samba-server 2012-08-29 15:47:42 +0000
+++ preseeds/templates/samba-server 2016-08-08 23:27:28 +0000
@@ -23,6 +23,6 @@
23d-i base-installer/kernel/override-image string linux-server23d-i base-installer/kernel/override-image string linux-server
24{% endblock %}24{% endblock %}
25{% block tasksel_first %}25{% block tasksel_first %}
26tasksel tasksel/first multiselect Basic Ubuntu server, Samba file server26tasksel tasksel/first multiselect server, samba-server
27{% endblock %}27{% endblock %}
2828
2929
=== modified file 'preseeds/templates/tomcat-server'
--- preseeds/templates/tomcat-server 2012-08-29 15:47:42 +0000
+++ preseeds/templates/tomcat-server 2016-08-08 23:27:28 +0000
@@ -23,6 +23,6 @@
23d-i base-installer/kernel/override-image string linux-server23d-i base-installer/kernel/override-image string linux-server
24{% endblock %}24{% endblock %}
25{% block tasksel_first %}25{% block tasksel_first %}
26tasksel tasksel/first multiselect Basic Ubuntu server, Tomcat Java server26tasksel tasksel/first multiselect server, tomcat-server
27{% endblock %}27{% endblock %}
2828
2929
=== modified file 'preseeds/templates/virtual-host'
--- preseeds/templates/virtual-host 2012-08-29 15:47:42 +0000
+++ preseeds/templates/virtual-host 2016-08-08 23:27:28 +0000
@@ -23,6 +23,6 @@
23d-i base-installer/kernel/override-image string linux-server23d-i base-installer/kernel/override-image string linux-server
24{% endblock %}24{% endblock %}
25{% block tasksel_first %}25{% block tasksel_first %}
26tasksel tasksel/first multiselect Basic Ubuntu server, Virtual Machine host26tasksel tasksel/first multiselect server, virt-host
27{% endblock %}27{% endblock %}
2828
2929
=== modified file 'preseeds/tomcat-server.preseed'
--- preseeds/tomcat-server.preseed 2016-02-02 18:11:57 +0000
+++ preseeds/tomcat-server.preseed 2016-08-08 23:27:28 +0000
@@ -244,7 +244,7 @@
244### Package selection244### Package selection
245245
246246
247tasksel tasksel/first multiselect Basic Ubuntu server, Tomcat Java server247tasksel tasksel/first multiselect server, tomcat-server
248248
249249
250250
251251
=== modified file 'preseeds/virtual-host.preseed'
--- preseeds/virtual-host.preseed 2016-02-02 18:11:57 +0000
+++ preseeds/virtual-host.preseed 2016-08-08 23:27:28 +0000
@@ -244,7 +244,7 @@
244### Package selection244### Package selection
245245
246246
247tasksel tasksel/first multiselect Basic Ubuntu server, Virtual Machine host247tasksel tasksel/first multiselect server, virt-host
248248
249249
250250

Subscribers

People subscribed via source and target branches

to all changes: