Merge lp:~ubuntu-mate-dev/debian-cd/ubuntu-mate-base into lp:~ubuntu-cdimage/debian-cd/ubun3

Proposed by Martin Wimpress 
Status: Work in progress
Proposed branch: lp:~ubuntu-mate-dev/debian-cd/ubuntu-mate-base
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Diff against target: 402 lines (+76/-35)
17 files modified
data/wily/preseed/xubuntu-base/ltsp.seed (+13/-0)
data/wily/preseed/xubuntu-base/xubuntu-base.seed (+5/-0)
data/wily/preseed/xubuntu/ltsp.seed (+0/-2)
data/wily/preseed/xubuntu/xubuntu.seed (+0/-2)
data/xenial/preseed/ubuntu-mate-base/ltsp.seed (+13/-0)
data/xenial/preseed/ubuntu-mate-base/ubuntu-mate-base.seed (+5/-0)
tools/add_live_filesystem (+8/-8)
tools/boot/wily/boot-amd64 (+3/-3)
tools/boot/wily/boot-amd64+mac (+3/-3)
tools/boot/wily/boot-i386 (+3/-3)
tools/boot/wily/boot-powerpc (+1/-1)
tools/boot/wily/common.sh (+3/-0)
tools/boot/xenial/boot-amd64 (+4/-4)
tools/boot/xenial/boot-amd64+mac (+4/-4)
tools/boot/xenial/boot-i386 (+4/-4)
tools/boot/xenial/boot-powerpc (+1/-1)
tools/boot/xenial/common.sh (+6/-0)
To merge this branch: bzr merge lp:~ubuntu-mate-dev/debian-cd/ubuntu-mate-base
Reviewer Review Type Date Requested Status
Dimitri John Ledkov (community) Needs Resubmitting
Adam Conrad Pending
Ubuntu CD Image Team Pending
Review via email: mp+284435@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Wimpress  (flexiondotorg) wrote :

This merge proposal adds support for Xubuntu Base and Ubuntu MATE Base as discussed with Adam Conrad. The "Base" variants contain a minimal desktop environment suitable for experienced user to craft their own setup.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Is this still needed? if yes, please provide design guidelines and any other changes that need to happen. And then it will need rebase onto current series.

Otherwise, we can drop this.

review: Needs Resubmitting

Unmerged revisions

1931. By Martin Wimpress 

Added ubuntu-mate-base.

1930. By Sean Davis

Replace Xubuntu Core with Base

1929. By Sean Davis

Merge in lp:~unit193/debian-cd/xubuntu-core via lp:~bluesabre/debian-cd/xubuntu-core to work around broken bzr hook

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'data/wily/preseed/xubuntu-base'
2=== added file 'data/wily/preseed/xubuntu-base/ltsp.seed'
3--- data/wily/preseed/xubuntu-base/ltsp.seed 1970-01-01 00:00:00 +0000
4+++ data/wily/preseed/xubuntu-base/ltsp.seed 2016-01-29 11:39:09 +0000
5@@ -0,0 +1,13 @@
6+# Build an LTSP client chroot.
7+d-i anna/choose_modules string ltsp-client-builder
8+d-i ltsp-client-builder/run boolean true
9+d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
10+# Install the Xubuntu desktop and LTSP server.
11+tasksel tasksel/first multiselect xubuntu-base
12+d-i preseed/early_command string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
13+d-i pkgsel/include/install-recommends boolean true
14+d-i pkgsel/include string ltsp-server-standalone openssh-server
15+# No XFCE translation packages yet.
16+d-i pkgsel/language-pack-patterns string
17+# Build a client chroot.
18+d-i preseed/late_command string chroot /target /usr/sbin/ltsp-update-sshkeys
19
20=== added file 'data/wily/preseed/xubuntu-base/xubuntu-base.seed'
21--- data/wily/preseed/xubuntu-base/xubuntu-base.seed 1970-01-01 00:00:00 +0000
22+++ data/wily/preseed/xubuntu-base/xubuntu-base.seed 2016-01-29 11:39:09 +0000
23@@ -0,0 +1,5 @@
24+# Install the Xubuntu desktop.
25+tasksel tasksel/first multiselect xubuntu-base
26+d-i preseed/early_command string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
27+# No XFCE translation packages yet.
28+d-i pkgsel/language-pack-patterns string
29
30=== modified file 'data/wily/preseed/xubuntu/ltsp.seed'
31--- data/wily/preseed/xubuntu/ltsp.seed 2015-05-08 05:28:37 +0000
32+++ data/wily/preseed/xubuntu/ltsp.seed 2016-01-29 11:39:09 +0000
33@@ -2,8 +2,6 @@
34 d-i anna/choose_modules string ltsp-client-builder
35 d-i ltsp-client-builder/run boolean true
36 d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
37-# Enable extras.ubuntu.com.
38-d-i apt-setup/extras boolean true
39 # Install the Xubuntu desktop and LTSP server.
40 tasksel tasksel/first multiselect xubuntu-desktop
41 d-i preseed/early_command string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
42
43=== modified file 'data/wily/preseed/xubuntu/xubuntu.seed'
44--- data/wily/preseed/xubuntu/xubuntu.seed 2015-05-08 05:28:37 +0000
45+++ data/wily/preseed/xubuntu/xubuntu.seed 2016-01-29 11:39:09 +0000
46@@ -1,5 +1,3 @@
47-# Enable extras.ubuntu.com.
48-d-i apt-setup/extras boolean true
49 # Install the Xubuntu desktop.
50 tasksel tasksel/first multiselect xubuntu-desktop
51 d-i preseed/early_command string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
52
53=== added symlink 'data/wily/xubuntu-base-access.pcx'
54=== target is u'xubuntu-access.pcx'
55=== added symlink 'data/wily/xubuntu-base-blank.pcx'
56=== target is u'xubuntu-blank.pcx'
57=== added symlink 'data/wily/xubuntu-base.pcx'
58=== target is u'xubuntu.pcx'
59=== added symlink 'data/wily/xubuntu-base.png'
60=== target is u'xubuntu.png'
61=== modified file 'data/wily/xubuntu.pcx'
62Binary files data/wily/xubuntu.pcx 2015-05-08 05:28:37 +0000 and data/wily/xubuntu.pcx 2016-01-29 11:39:09 +0000 differ
63=== added directory 'data/xenial/preseed/ubuntu-mate-base'
64=== added file 'data/xenial/preseed/ubuntu-mate-base/ltsp.seed'
65--- data/xenial/preseed/ubuntu-mate-base/ltsp.seed 1970-01-01 00:00:00 +0000
66+++ data/xenial/preseed/ubuntu-mate-base/ltsp.seed 2016-01-29 11:39:09 +0000
67@@ -0,0 +1,13 @@
68+# Build an LTSP client chroot.
69+d-i anna/choose_modules string ltsp-client-builder
70+d-i ltsp-client-builder/run boolean true
71+d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
72+# Install the Ubuntu MATE desktop and LTSP server.
73+tasksel tasksel/first multiselect ubuntu-mate-core
74+d-i preseed/early_command string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
75+d-i pkgsel/include/install-recommends boolean false
76+d-i pkgsel/include string ltsp-server-standalone openssh-server
77+# No MATE translation packages yet.
78+d-i pkgsel/language-pack-patterns string
79+# Build a client chroot.
80+d-i preseed/late_command string chroot /target /usr/sbin/ltsp-update-sshkeys
81
82=== added file 'data/xenial/preseed/ubuntu-mate-base/ubuntu-mate-base.seed'
83--- data/xenial/preseed/ubuntu-mate-base/ubuntu-mate-base.seed 1970-01-01 00:00:00 +0000
84+++ data/xenial/preseed/ubuntu-mate-base/ubuntu-mate-base.seed 2016-01-29 11:39:09 +0000
85@@ -0,0 +1,5 @@
86+# Install the Ubuntu MATE desktop.
87+tasksel tasksel/first multiselect ubuntu-mate-core
88+d-i preseed/early_command string . /usr/share/debconf/confmodule; db_get debconf/priority; case $RET in low|medium) db_fset tasksel/first seen false; echo 'tasksel tasksel/first seen false' >>/var/lib/preseed/log ;; esac
89+# No MATE translation packages yet.
90+d-i pkgsel/language-pack-patterns string
91
92=== added symlink 'data/xenial/ubuntu-mate-base-access.pcx'
93=== target is u'ubuntu-mate-access.pcx'
94=== added symlink 'data/xenial/ubuntu-mate-base-blank.pcx'
95=== target is u'ubuntu-mate-blank.pcx'
96=== added symlink 'data/xenial/ubuntu-mate-base.pcx'
97=== target is u'ubuntu-mate.pcx'
98=== added symlink 'data/xenial/ubuntu-mate-base.png'
99=== target is u'ubuntu-mate.png'
100=== modified file 'tools/add_live_filesystem'
101--- tools/add_live_filesystem 2015-01-26 19:48:42 +0000
102+++ tools/add_live_filesystem 2016-01-29 11:39:09 +0000
103@@ -102,14 +102,14 @@
104 # installation locale code.
105 RELEASE_NOTES=
106 case $PROJECT in
107- ubuntu|kubuntu|edubuntu|xubuntu|gobuntu|ubuntustudio|mythbuntu|lubuntu|ubuntu-gnome|ubuntukylin|ubuntu-desktop-next|ubuntu-mate)
108- case $DIST in
109- warty|hoary|breezy|dapper|edgy)
110- ;;
111- *)
112- RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=$PROJECT&ver=${DEBVERSION%% *}&lang=\${LANG}"
113- ;;
114- esac
115+ ubuntu|kubuntu|edubuntu|xubuntu|ubuntustudio|mythbuntu|lubuntu|ubuntu-gnome|ubuntukylin|ubuntu-desktop-next|ubuntu-mate)
116+ RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=$PROJECT&ver=${DEBVERSION%% *}&lang=\${LANG}"
117+ ;;
118+ ubuntu-mate-base)
119+ RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=ubuntu-mate&ver=${DEBVERSION%% *}&lang=\${LANG}"
120+ ;;
121+ xubuntu-base)
122+ RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=xubuntu&ver=${DEBVERSION%% *}&lang=\${LANG}"
123 ;;
124 esac
125 if [ "$RELEASE_NOTES" ]; then
126
127=== modified file 'tools/boot/wily/boot-amd64'
128--- tools/boot/wily/boot-amd64 2015-05-14 16:01:23 +0000
129+++ tools/boot/wily/boot-amd64 2016-01-29 11:39:09 +0000
130@@ -185,7 +185,7 @@
131 HIDDEN_TIMEOUT=
132 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
133 case $PROJECT in
134- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
135+ ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
136 HIDDEN_TIMEOUT=2
137 ;;
138 mythbuntu)
139@@ -361,7 +361,7 @@
140 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
141 access-options=v1 v2 brltty m1
142 EOF
143-elif [ "$PROJECT" = xubuntu ]; then
144+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
145 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
146 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
147 access-options=v2 v3 brltty m2
148@@ -541,7 +541,7 @@
149 EOF
150 fi
151 fi
152-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
153+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
154 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
155 label ltsp=Install an LTSP server
156 replace ltsp=file=/cdrom/preseed/ltsp.seed
157
158=== modified file 'tools/boot/wily/boot-amd64+mac'
159--- tools/boot/wily/boot-amd64+mac 2015-05-14 16:01:23 +0000
160+++ tools/boot/wily/boot-amd64+mac 2016-01-29 11:39:09 +0000
161@@ -173,7 +173,7 @@
162 HIDDEN_TIMEOUT=
163 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
164 case $PROJECT in
165- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate)
166+ ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate)
167 HIDDEN_TIMEOUT=2
168 ;;
169 mythbuntu)
170@@ -336,7 +336,7 @@
171 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
172 access-options=v1 v2 brltty m1
173 EOF
174-elif [ "$PROJECT" = xubuntu ]; then
175+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
176 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
177 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
178 access-options=v2 v3 brltty m2
179@@ -463,7 +463,7 @@
180 EOF
181 fi
182 fi
183-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
184+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
185 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
186 label ltsp=Install an LTSP server
187 replace ltsp=file=/cdrom/preseed/ltsp.seed
188
189=== modified file 'tools/boot/wily/boot-i386'
190--- tools/boot/wily/boot-i386 2015-05-14 16:01:23 +0000
191+++ tools/boot/wily/boot-i386 2016-01-29 11:39:09 +0000
192@@ -174,7 +174,7 @@
193 HIDDEN_TIMEOUT=
194 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
195 case $PROJECT in
196- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
197+ ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
198 HIDDEN_TIMEOUT=2
199 ;;
200 mythbuntu)
201@@ -341,7 +341,7 @@
202 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
203 access-options=v1 v2 brltty m1
204 EOF
205-elif [ "$PROJECT" = xubuntu ]; then
206+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
207 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
208 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
209 access-options=v2 v3 brltty m2
210@@ -467,7 +467,7 @@
211 EOF
212 fi
213 fi
214-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
215+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
216 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
217 label ltsp=Install an LTSP server
218 replace ltsp=file=/cdrom/preseed/ltsp.seed
219
220=== modified file 'tools/boot/wily/boot-powerpc'
221--- tools/boot/wily/boot-powerpc 2015-05-14 16:01:23 +0000
222+++ tools/boot/wily/boot-powerpc 2016-01-29 11:39:09 +0000
223@@ -188,7 +188,7 @@
224 if [ "$CDIMAGE_INSTALL_BASE" = 1 ] && [ "$PROJECT" != ubuntu-server ]; then
225 cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.cli
226 fi
227- if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
228+ if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = ubuntu-mate ]); then
229 cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.ltsp
230 fi
231 if [ "$CDIMAGE_LIVE" = 1 ]; then
232
233=== modified file 'tools/boot/wily/common.sh'
234--- tools/boot/wily/common.sh 2015-05-14 16:01:23 +0000
235+++ tools/boot/wily/common.sh 2016-01-29 11:39:09 +0000
236@@ -33,6 +33,9 @@
237 xubuntu)
238 DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu.seed'
239 ;;
240+ xubuntu-base)
241+ DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu-base.seed'
242+ ;;
243 ubuntu-server)
244 DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-server.seed'
245 ;;
246
247=== modified file 'tools/boot/xenial/boot-amd64'
248--- tools/boot/xenial/boot-amd64 2015-10-22 16:03:46 +0000
249+++ tools/boot/xenial/boot-amd64 2016-01-29 11:39:09 +0000
250@@ -185,7 +185,7 @@
251 HIDDEN_TIMEOUT=
252 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
253 case $PROJECT in
254- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
255+ ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-mate-base)
256 HIDDEN_TIMEOUT=2
257 ;;
258 mythbuntu)
259@@ -338,7 +338,7 @@
260 screen-colour=0x2D3335
261 EOF
262 fi
263-if [ "$PROJECT" = ubuntu-mate ]; then
264+if [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]; then
265 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
266 foreground=0xffffff
267 background=0x87a556
268@@ -361,7 +361,7 @@
269 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
270 access-options=v1 v2 brltty m1
271 EOF
272-elif [ "$PROJECT" = xubuntu ]; then
273+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
274 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
275 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
276 access-options=v2 v3 brltty m2
277@@ -541,7 +541,7 @@
278 EOF
279 fi
280 fi
281-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
282+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]); then
283 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
284 label ltsp=Install an LTSP server
285 replace ltsp=file=/cdrom/preseed/ltsp.seed
286
287=== modified file 'tools/boot/xenial/boot-amd64+mac'
288--- tools/boot/xenial/boot-amd64+mac 2015-10-22 16:03:46 +0000
289+++ tools/boot/xenial/boot-amd64+mac 2016-01-29 11:39:09 +0000
290@@ -173,7 +173,7 @@
291 HIDDEN_TIMEOUT=
292 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
293 case $PROJECT in
294- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate)
295+ ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate|ubuntu-mate-base)
296 HIDDEN_TIMEOUT=2
297 ;;
298 mythbuntu)
299@@ -313,7 +313,7 @@
300 screen-colour=0x270A1E
301 EOF
302 fi
303-if [ "$PROJECT" = ubuntu-mate ]; then
304+if [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]; then
305 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
306 foreground=0xffffff
307 background=0x87a556
308@@ -336,7 +336,7 @@
309 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
310 access-options=v1 v2 brltty m1
311 EOF
312-elif [ "$PROJECT" = xubuntu ]; then
313+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
314 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
315 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
316 access-options=v2 v3 brltty m2
317@@ -463,7 +463,7 @@
318 EOF
319 fi
320 fi
321-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
322+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]); then
323 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
324 label ltsp=Install an LTSP server
325 replace ltsp=file=/cdrom/preseed/ltsp.seed
326
327=== modified file 'tools/boot/xenial/boot-i386'
328--- tools/boot/xenial/boot-i386 2015-10-22 16:03:46 +0000
329+++ tools/boot/xenial/boot-i386 2016-01-29 11:39:09 +0000
330@@ -174,7 +174,7 @@
331 HIDDEN_TIMEOUT=
332 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
333 case $PROJECT in
334- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate)
335+ ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-mate-base)
336 HIDDEN_TIMEOUT=2
337 ;;
338 mythbuntu)
339@@ -318,7 +318,7 @@
340 screen-colour=0x2D3335
341 EOF
342 fi
343-if [ "$PROJECT" = ubuntu-mate ]; then
344+if [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]; then
345 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
346 foreground=0xffffff
347 background=0x87a556
348@@ -341,7 +341,7 @@
349 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
350 access-options=v1 v2 brltty m1
351 EOF
352-elif [ "$PROJECT" = xubuntu ]; then
353+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
354 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
355 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
356 access-options=v2 v3 brltty m2
357@@ -467,7 +467,7 @@
358 EOF
359 fi
360 fi
361-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
362+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]); then
363 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
364 label ltsp=Install an LTSP server
365 replace ltsp=file=/cdrom/preseed/ltsp.seed
366
367=== modified file 'tools/boot/xenial/boot-powerpc'
368--- tools/boot/xenial/boot-powerpc 2015-10-22 16:03:46 +0000
369+++ tools/boot/xenial/boot-powerpc 2016-01-29 11:39:09 +0000
370@@ -188,7 +188,7 @@
371 if [ "$CDIMAGE_INSTALL_BASE" = 1 ] && [ "$PROJECT" != ubuntu-server ]; then
372 cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.cli
373 fi
374- if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
375+ if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = ubuntu-mate ] || [ "$PROJECT" = ubuntu-mate-base ]); then
376 cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.ltsp
377 fi
378 if [ "$CDIMAGE_LIVE" = 1 ]; then
379
380=== modified file 'tools/boot/xenial/common.sh'
381--- tools/boot/xenial/common.sh 2015-12-11 12:28:40 +0000
382+++ tools/boot/xenial/common.sh 2016-01-29 11:39:09 +0000
383@@ -33,6 +33,9 @@
384 xubuntu)
385 DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu.seed'
386 ;;
387+ xubuntu-base)
388+ DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu-base.seed'
389+ ;;
390 ubuntu-server)
391 DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-server.seed'
392 ;;
393@@ -60,6 +63,9 @@
394 ubuntu-mate)
395 DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-mate.seed'
396 ;;
397+ ubuntu-mate-base)
398+ DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-mate-base.seed'
399+ ;;
400 *)
401 DEFAULT_PRESEED=
402 ;;

Subscribers

People subscribed via source and target branches