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

Proposed by Joshua Powers on 2016-08-08
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 2016-08-08 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.
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
1=== modified file 'preseeds/default.preseed'
2--- preseeds/default.preseed 2016-02-02 18:14:00 +0000
3+++ preseeds/default.preseed 2016-08-08 23:27:28 +0000
4@@ -244,7 +244,7 @@
5 ### Package selection
6
7
8-tasksel tasksel/first multiselect Basic Ubuntu server
9+tasksel tasksel/first multiselect server
10
11
12
13
14=== modified file 'preseeds/dns-server.preseed'
15--- preseeds/dns-server.preseed 2016-02-02 18:11:57 +0000
16+++ preseeds/dns-server.preseed 2016-08-08 23:27:28 +0000
17@@ -244,7 +244,7 @@
18 ### Package selection
19
20
21-tasksel tasksel/first multiselect Basic Ubuntu server, DNS server
22+tasksel tasksel/first multiselect server, dns-server
23
24
25
26
27=== modified file 'preseeds/lamp.preseed'
28--- preseeds/lamp.preseed 2016-02-02 18:11:57 +0000
29+++ preseeds/lamp.preseed 2016-08-08 23:27:28 +0000
30@@ -244,7 +244,7 @@
31 ### Package selection
32
33
34-tasksel tasksel/first multiselect Basic Ubuntu server, LAMP server
35+tasksel tasksel/first multiselect server, lamp-server
36
37
38
39
40=== modified file 'preseeds/lvm.preseed'
41--- preseeds/lvm.preseed 2016-02-02 18:11:57 +0000
42+++ preseeds/lvm.preseed 2016-08-08 23:27:28 +0000
43@@ -243,7 +243,7 @@
44 ### Package selection
45
46
47-tasksel tasksel/first multiselect Basic Ubuntu server
48+tasksel tasksel/first multiselect server
49
50
51
52
53=== modified file 'preseeds/mail-server.preseed'
54--- preseeds/mail-server.preseed 2016-02-02 18:11:57 +0000
55+++ preseeds/mail-server.preseed 2016-08-08 23:27:28 +0000
56@@ -244,7 +244,7 @@
57 ### Package selection
58
59
60-tasksel tasksel/first multiselect Basic Ubuntu server, Mail server
61+tasksel tasksel/first multiselect server, mail-server
62
63
64
65
66=== modified file 'preseeds/multi-lvm.preseed'
67--- preseeds/multi-lvm.preseed 2016-02-02 18:11:57 +0000
68+++ preseeds/multi-lvm.preseed 2016-08-08 23:27:28 +0000
69@@ -244,7 +244,7 @@
70 ### Package selection
71
72
73-tasksel tasksel/first multiselect Basic Ubuntu server
74+tasksel tasksel/first multiselect server
75
76
77
78
79=== modified file 'preseeds/openssh-server.preseed'
80--- preseeds/openssh-server.preseed 2016-02-02 18:11:57 +0000
81+++ preseeds/openssh-server.preseed 2016-08-08 23:27:28 +0000
82@@ -244,7 +244,7 @@
83 ### Package selection
84
85
86-tasksel tasksel/first multiselect Basic Ubuntu server, OpenSSH server
87+tasksel tasksel/first multiselect server, openssh-server
88
89
90
91
92=== modified file 'preseeds/postgresql-server.preseed'
93--- preseeds/postgresql-server.preseed 2016-02-02 18:11:57 +0000
94+++ preseeds/postgresql-server.preseed 2016-08-08 23:27:28 +0000
95@@ -244,7 +244,7 @@
96 ### Package selection
97
98
99-tasksel tasksel/first multiselect Basic Ubuntu server, PostgreSQL database
100+tasksel tasksel/first multiselect Basic server, postgresql-database
101
102
103
104
105=== modified file 'preseeds/raid1.preseed'
106--- preseeds/raid1.preseed 2016-02-02 18:11:57 +0000
107+++ preseeds/raid1.preseed 2016-08-08 23:27:28 +0000
108@@ -285,7 +285,7 @@
109 ### Package selection
110
111
112-tasksel tasksel/first multiselect Basic Ubuntu server
113+tasksel tasksel/first multiselect server
114
115
116
117
118=== modified file 'preseeds/samba-server.preseed'
119--- preseeds/samba-server.preseed 2016-02-02 18:11:57 +0000
120+++ preseeds/samba-server.preseed 2016-08-08 23:27:28 +0000
121@@ -244,7 +244,7 @@
122 ### Package selection
123
124
125-tasksel tasksel/first multiselect Basic Ubuntu server, Samba file server
126+tasksel tasksel/first multiselect server, samba-server
127
128
129
130
131=== modified file 'preseeds/templates/base'
132--- preseeds/templates/base 2016-01-19 20:28:15 +0000
133+++ preseeds/templates/base 2016-08-08 23:27:28 +0000
134@@ -227,7 +227,7 @@
135 ### Package selection
136
137 {% block tasksel_first %}
138-tasksel tasksel/first multiselect Basic Ubuntu server
139+tasksel tasksel/first multiselect server
140 {% endblock %}
141
142 {% block pkgsel_first %}
143
144=== modified file 'preseeds/templates/dns-server'
145--- preseeds/templates/dns-server 2012-08-29 15:47:42 +0000
146+++ preseeds/templates/dns-server 2016-08-08 23:27:28 +0000
147@@ -23,5 +23,5 @@
148 d-i base-installer/kernel/override-image string linux-server
149 {% endblock %}
150 {% block tasksel_first %}
151-tasksel tasksel/first multiselect Basic Ubuntu server, DNS server
152+tasksel tasksel/first multiselect server, dns-server
153 {% endblock %}
154
155=== modified file 'preseeds/templates/lamp'
156--- preseeds/templates/lamp 2012-08-29 15:47:42 +0000
157+++ preseeds/templates/lamp 2016-08-08 23:27:28 +0000
158@@ -23,5 +23,5 @@
159 d-i base-installer/kernel/override-image string linux-server
160 {% endblock %}
161 {% block tasksel_first %}
162-tasksel tasksel/first multiselect Basic Ubuntu server, LAMP server
163+tasksel tasksel/first multiselect server, lamp-server
164 {% endblock %}
165
166=== modified file 'preseeds/templates/mail-server'
167--- preseeds/templates/mail-server 2012-08-29 15:47:42 +0000
168+++ preseeds/templates/mail-server 2016-08-08 23:27:28 +0000
169@@ -23,5 +23,5 @@
170 d-i base-installer/kernel/override-image string linux-server
171 {% endblock %}
172 {% block tasksel_first %}
173-tasksel tasksel/first multiselect Basic Ubuntu server, Mail server
174+tasksel tasksel/first multiselect server, mail-server
175 {% endblock %}
176
177=== modified file 'preseeds/templates/openssh-server'
178--- preseeds/templates/openssh-server 2012-08-29 15:47:42 +0000
179+++ preseeds/templates/openssh-server 2016-08-08 23:27:28 +0000
180@@ -23,5 +23,5 @@
181 d-i base-installer/kernel/override-image string linux-server
182 {% endblock %}
183 {% block tasksel_first %}
184-tasksel tasksel/first multiselect Basic Ubuntu server, OpenSSH server
185+tasksel tasksel/first multiselect server, openssh-server
186 {% endblock %}
187
188=== modified file 'preseeds/templates/postgresql-server'
189--- preseeds/templates/postgresql-server 2012-08-29 15:47:42 +0000
190+++ preseeds/templates/postgresql-server 2016-08-08 23:27:28 +0000
191@@ -23,5 +23,5 @@
192 d-i base-installer/kernel/override-image string linux-server
193 {% endblock %}
194 {% block tasksel_first %}
195-tasksel tasksel/first multiselect Basic Ubuntu server, PostgreSQL database
196+tasksel tasksel/first multiselect server, postgresql-databases
197 {% endblock %}
198
199=== modified file 'preseeds/templates/print-server'
200--- preseeds/templates/print-server 2012-08-29 15:47:42 +0000
201+++ preseeds/templates/print-server 2016-08-08 23:27:28 +0000
202@@ -23,5 +23,5 @@
203 d-i base-installer/kernel/override-image string linux-server
204 {% endblock %}
205 {% block tasksel_first %}
206-tasksel tasksel/first multiselect Basic Ubuntu server, Print server
207+tasksel tasksel/first multiselect server, print-server
208 {% endblock %}
209
210=== modified file 'preseeds/templates/samba-server'
211--- preseeds/templates/samba-server 2012-08-29 15:47:42 +0000
212+++ preseeds/templates/samba-server 2016-08-08 23:27:28 +0000
213@@ -23,6 +23,6 @@
214 d-i base-installer/kernel/override-image string linux-server
215 {% endblock %}
216 {% block tasksel_first %}
217-tasksel tasksel/first multiselect Basic Ubuntu server, Samba file server
218+tasksel tasksel/first multiselect server, samba-server
219 {% endblock %}
220
221
222=== modified file 'preseeds/templates/tomcat-server'
223--- preseeds/templates/tomcat-server 2012-08-29 15:47:42 +0000
224+++ preseeds/templates/tomcat-server 2016-08-08 23:27:28 +0000
225@@ -23,6 +23,6 @@
226 d-i base-installer/kernel/override-image string linux-server
227 {% endblock %}
228 {% block tasksel_first %}
229-tasksel tasksel/first multiselect Basic Ubuntu server, Tomcat Java server
230+tasksel tasksel/first multiselect server, tomcat-server
231 {% endblock %}
232
233
234=== modified file 'preseeds/templates/virtual-host'
235--- preseeds/templates/virtual-host 2012-08-29 15:47:42 +0000
236+++ preseeds/templates/virtual-host 2016-08-08 23:27:28 +0000
237@@ -23,6 +23,6 @@
238 d-i base-installer/kernel/override-image string linux-server
239 {% endblock %}
240 {% block tasksel_first %}
241-tasksel tasksel/first multiselect Basic Ubuntu server, Virtual Machine host
242+tasksel tasksel/first multiselect server, virt-host
243 {% endblock %}
244
245
246=== modified file 'preseeds/tomcat-server.preseed'
247--- preseeds/tomcat-server.preseed 2016-02-02 18:11:57 +0000
248+++ preseeds/tomcat-server.preseed 2016-08-08 23:27:28 +0000
249@@ -244,7 +244,7 @@
250 ### Package selection
251
252
253-tasksel tasksel/first multiselect Basic Ubuntu server, Tomcat Java server
254+tasksel tasksel/first multiselect server, tomcat-server
255
256
257
258
259=== modified file 'preseeds/virtual-host.preseed'
260--- preseeds/virtual-host.preseed 2016-02-02 18:11:57 +0000
261+++ preseeds/virtual-host.preseed 2016-08-08 23:27:28 +0000
262@@ -244,7 +244,7 @@
263 ### Package selection
264
265
266-tasksel tasksel/first multiselect Basic Ubuntu server, Virtual Machine host
267+tasksel tasksel/first multiselect server, virt-host
268
269
270

Subscribers

People subscribed via source and target branches