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

Proposed by Sean Davis on 2018-06-04
Status: Needs review
Proposed branch: lp:~xubuntu-dev/debian-cd/xubuntu-base
Merge into: lp:~ubuntu-cdimage/debian-cd/ubuntu
Diff against target: 319 lines (+43/-24)
20 files modified
data/bionic/preseed/xubuntu/ltsp.seed (+1/-1)
data/bionic/preseed/xubuntu/xubuntu.seed (+1/-1)
data/cosmic/preseed/xubuntu-base/ltsp.seed (+13/-0)
data/cosmic/preseed/xubuntu-base/xubuntu-base.seed (+5/-0)
data/cosmic/preseed/xubuntu/ltsp.seed (+0/-2)
data/cosmic/preseed/xubuntu/xubuntu.seed (+0/-2)
data/wily/preseed/xubuntu/ltsp.seed (+1/-1)
data/wily/preseed/xubuntu/xubuntu.seed (+1/-1)
data/xenial/preseed/xubuntu/ltsp.seed (+1/-1)
data/xenial/preseed/xubuntu/xubuntu.seed (+1/-1)
tools/add_live_filesystem (+2/-0)
tools/boot/bionic/boot-amd64 (+1/-1)
tools/boot/bionic/boot-amd64+mac (+1/-1)
tools/boot/cosmic/boot-amd64 (+2/-2)
tools/boot/cosmic/boot-amd64+mac (+3/-3)
tools/boot/cosmic/boot-i386 (+4/-4)
tools/boot/cosmic/boot-powerpc (+1/-1)
tools/boot/cosmic/common.sh (+3/-0)
tools/boot/xenial/boot-amd64 (+1/-1)
tools/boot/xenial/boot-amd64+mac (+1/-1)
To merge this branch: bzr merge lp:~xubuntu-dev/debian-cd/xubuntu-base
Reviewer Review Type Date Requested Status
Ubuntu CD Image Team 2018-06-04 Pending
Review via email: mp+347414@code.launchpad.net

Commit message

Add xubuntu-base to debian-cd/ubuntu

Description of the change

This series of patches adds Xubuntu Base to the official Ubuntu CD Image download links. Xubuntu Base is supported by the Xubuntu Team and is the ISO image for the xubuntu-core task which has been around for a few releases now.

There has been some conflict with the previous naming of Xubuntu Base/Core because of it's similarity to Ubuntu Core. Regardless, you can learn more about it here: https://xubuntu.org/news/introducing-xubuntu-core/

Related branches:
- https://code.launchpad.net/~xubuntu-dev/debian-cd/xubuntu-base
- https://code.launchpad.net/~xubuntu-dev/livecd-rootfs/xubuntu-base
- https://code.launchpad.net/~xubuntu-dev/ubuntu-cdimage/xubuntu-base

To post a comment you must log in.

Unmerged revisions

1937. By Sean Davis on 2018-05-31

Bionic to Cosmic

1936. By Sean Davis on 2018-05-31

Merge in lp:~ubuntu-cdimage/debian-cd/ubuntu rev 1992

1935. By Sean Davis on 2018-03-28

Xenial to Bionic

1934. By Sean Davis on 2018-03-28

Merge in lp:~ubuntu-cdimage/debian-cd/ubuntu rev 1986

1933. By Sean Davis on 2016-01-30

Update splash image

1932. By Sean Davis on 2016-01-30

We're still using xubuntu-core as the task at this time

1931. By Sean Davis on 2016-01-30

Wily to Xenial

1930. By Sean Davis on 2016-01-26

Replace Xubuntu Core with Base

1929. By Sean Davis on 2016-01-26

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=== modified file 'data/bionic/preseed/xubuntu/ltsp.seed'
2--- data/bionic/preseed/xubuntu/ltsp.seed 2017-11-08 04:58:14 +0000
3+++ data/bionic/preseed/xubuntu/ltsp.seed 2018-06-04 22:47:53 +0000
4@@ -3,7 +3,7 @@
5 d-i ltsp-client-builder/run boolean true
6 d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
7 # Enable extras.ubuntu.com.
8-d-i apt-setup/extras boolean true
9+d-i apt-setup/extras boolean true
10 # Install the Xubuntu desktop and LTSP server.
11 tasksel tasksel/first multiselect xubuntu-desktop
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
14=== modified file 'data/bionic/preseed/xubuntu/xubuntu.seed'
15--- data/bionic/preseed/xubuntu/xubuntu.seed 2017-11-08 04:58:14 +0000
16+++ data/bionic/preseed/xubuntu/xubuntu.seed 2018-06-04 22:47:53 +0000
17@@ -1,5 +1,5 @@
18 # Enable extras.ubuntu.com.
19-d-i apt-setup/extras boolean true
20+d-i apt-setup/extras boolean true
21 # Install the Xubuntu desktop.
22 tasksel tasksel/first multiselect xubuntu-desktop
23 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
24
25=== added directory 'data/cosmic/preseed/xubuntu-base'
26=== added file 'data/cosmic/preseed/xubuntu-base/ltsp.seed'
27--- data/cosmic/preseed/xubuntu-base/ltsp.seed 1970-01-01 00:00:00 +0000
28+++ data/cosmic/preseed/xubuntu-base/ltsp.seed 2018-06-04 22:47:53 +0000
29@@ -0,0 +1,13 @@
30+# Build an LTSP client chroot.
31+d-i anna/choose_modules string ltsp-client-builder
32+d-i ltsp-client-builder/run boolean true
33+d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
34+# Install the Xubuntu desktop and LTSP server.
35+tasksel tasksel/first multiselect xubuntu-core
36+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
37+d-i pkgsel/include/install-recommends boolean true
38+d-i pkgsel/include string ltsp-server-standalone openssh-server
39+# No XFCE translation packages yet.
40+d-i pkgsel/language-pack-patterns string
41+# Build a client chroot.
42+d-i preseed/late_command string chroot /target /usr/sbin/ltsp-update-sshkeys
43
44=== added file 'data/cosmic/preseed/xubuntu-base/xubuntu-base.seed'
45--- data/cosmic/preseed/xubuntu-base/xubuntu-base.seed 1970-01-01 00:00:00 +0000
46+++ data/cosmic/preseed/xubuntu-base/xubuntu-base.seed 2018-06-04 22:47:53 +0000
47@@ -0,0 +1,5 @@
48+# Install the Xubuntu desktop.
49+tasksel tasksel/first multiselect xubuntu-core
50+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
51+# No XFCE translation packages yet.
52+d-i pkgsel/language-pack-patterns string
53
54=== modified file 'data/cosmic/preseed/xubuntu/ltsp.seed'
55--- data/cosmic/preseed/xubuntu/ltsp.seed 2018-05-02 21:44:19 +0000
56+++ data/cosmic/preseed/xubuntu/ltsp.seed 2018-06-04 22:47:53 +0000
57@@ -2,8 +2,6 @@
58 d-i anna/choose_modules string ltsp-client-builder
59 d-i ltsp-client-builder/run boolean true
60 d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
61-# Enable extras.ubuntu.com.
62-d-i apt-setup/extras boolean true
63 # Install the Xubuntu desktop and LTSP server.
64 tasksel tasksel/first multiselect xubuntu-desktop
65 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
66
67=== modified file 'data/cosmic/preseed/xubuntu/xubuntu.seed'
68--- data/cosmic/preseed/xubuntu/xubuntu.seed 2018-05-02 21:44:19 +0000
69+++ data/cosmic/preseed/xubuntu/xubuntu.seed 2018-06-04 22:47:53 +0000
70@@ -1,5 +1,3 @@
71-# Enable extras.ubuntu.com.
72-d-i apt-setup/extras boolean true
73 # Install the Xubuntu desktop.
74 tasksel tasksel/first multiselect xubuntu-desktop
75 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
76
77=== added symlink 'data/cosmic/xubuntu-base-access.pcx'
78=== target is u'xubuntu-access.pcx'
79=== added symlink 'data/cosmic/xubuntu-base-blank.pcx'
80=== target is u'xubuntu-blank.pcx'
81=== added symlink 'data/cosmic/xubuntu-base.pcx'
82=== target is u'xubuntu.pcx'
83=== added symlink 'data/cosmic/xubuntu-base.png'
84=== target is u'xubuntu.png'
85=== modified file 'data/wily/preseed/xubuntu/ltsp.seed'
86--- data/wily/preseed/xubuntu/ltsp.seed 2015-05-08 05:28:37 +0000
87+++ data/wily/preseed/xubuntu/ltsp.seed 2018-06-04 22:47:53 +0000
88@@ -3,7 +3,7 @@
89 d-i ltsp-client-builder/run boolean true
90 d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
91 # Enable extras.ubuntu.com.
92-d-i apt-setup/extras boolean true
93+d-i apt-setup/extras boolean true
94 # Install the Xubuntu desktop and LTSP server.
95 tasksel tasksel/first multiselect xubuntu-desktop
96 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
97
98=== modified file 'data/wily/preseed/xubuntu/xubuntu.seed'
99--- data/wily/preseed/xubuntu/xubuntu.seed 2015-05-08 05:28:37 +0000
100+++ data/wily/preseed/xubuntu/xubuntu.seed 2018-06-04 22:47:53 +0000
101@@ -1,5 +1,5 @@
102 # Enable extras.ubuntu.com.
103-d-i apt-setup/extras boolean true
104+d-i apt-setup/extras boolean true
105 # Install the Xubuntu desktop.
106 tasksel tasksel/first multiselect xubuntu-desktop
107 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
108
109=== modified file 'data/wily/xubuntu.pcx'
110Binary files data/wily/xubuntu.pcx 2015-05-08 05:28:37 +0000 and data/wily/xubuntu.pcx 2018-06-04 22:47:53 +0000 differ
111=== modified file 'data/xenial/preseed/xubuntu/ltsp.seed'
112--- data/xenial/preseed/xubuntu/ltsp.seed 2015-10-22 16:03:46 +0000
113+++ data/xenial/preseed/xubuntu/ltsp.seed 2018-06-04 22:47:53 +0000
114@@ -3,7 +3,7 @@
115 d-i ltsp-client-builder/run boolean true
116 d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
117 # Enable extras.ubuntu.com.
118-d-i apt-setup/extras boolean true
119+d-i apt-setup/extras boolean true
120 # Install the Xubuntu desktop and LTSP server.
121 tasksel tasksel/first multiselect xubuntu-desktop
122 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
123
124=== modified file 'data/xenial/preseed/xubuntu/xubuntu.seed'
125--- data/xenial/preseed/xubuntu/xubuntu.seed 2015-10-22 16:03:46 +0000
126+++ data/xenial/preseed/xubuntu/xubuntu.seed 2018-06-04 22:47:53 +0000
127@@ -1,5 +1,5 @@
128 # Enable extras.ubuntu.com.
129-d-i apt-setup/extras boolean true
130+d-i apt-setup/extras boolean true
131 # Install the Xubuntu desktop.
132 tasksel tasksel/first multiselect xubuntu-desktop
133 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
134
135=== modified file 'data/xenial/xubuntu.pcx'
136Binary files data/xenial/xubuntu.pcx 2015-10-22 16:03:46 +0000 and data/xenial/xubuntu.pcx 2018-06-04 22:47:53 +0000 differ
137=== modified file 'tools/add_live_filesystem'
138--- tools/add_live_filesystem 2018-04-10 09:06:11 +0000
139+++ tools/add_live_filesystem 2018-06-04 22:47:53 +0000
140@@ -134,6 +134,8 @@
141 RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=$PROJECT&ver=${DEBVERSION%% *}&lang=\${LANG}"
142 ;;
143 esac
144+ xubuntu-base)
145+ RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=xubuntu&ver=${DEBVERSION%% *}&lang=\${LANG}"
146 ;;
147 esac
148 if [ "$RELEASE_NOTES" ]; then
149
150=== modified file 'tools/boot/bionic/boot-amd64'
151--- tools/boot/bionic/boot-amd64 2018-03-03 07:07:57 +0000
152+++ tools/boot/bionic/boot-amd64 2018-06-04 22:47:53 +0000
153@@ -29,7 +29,7 @@
154 cd $CDDIR/..
155
156 #
157-# This script is called with $1 (now $N) as the CD to
158+# This script is called with $1 (now $N) as the CD to
159 # make bootable. N may be in the form "n" or "n_NONUS"
160 # There may be more than 4 disks...support extras.
161
162
163=== modified file 'tools/boot/bionic/boot-amd64+mac'
164--- tools/boot/bionic/boot-amd64+mac 2017-11-08 04:58:14 +0000
165+++ tools/boot/bionic/boot-amd64+mac 2018-06-04 22:47:53 +0000
166@@ -31,7 +31,7 @@
167 cd $CDDIR/..
168
169 #
170-# This script is called with $1 (now $N) as the CD to
171+# This script is called with $1 (now $N) as the CD to
172 # make bootable. N may be in the form "n" or "n_NONUS"
173 # There may be more than 4 disks...support extras.
174
175
176=== modified file 'tools/boot/cosmic/boot-amd64'
177--- tools/boot/cosmic/boot-amd64 2018-05-02 21:44:19 +0000
178+++ tools/boot/cosmic/boot-amd64 2018-06-04 22:47:53 +0000
179@@ -406,7 +406,7 @@
180 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
181 access-options=v1 v2 brltty m1
182 EOF
183-elif [ "$PROJECT" = xubuntu ]; then
184+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
185 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
186 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
187 access-options=v2 v3 brltty m2
188@@ -611,7 +611,7 @@
189 done
190 fi
191 fi
192-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
193+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
194 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
195 label ltsp=Install an LTSP server
196 replace ltsp=file=/cdrom/preseed/ltsp.seed
197
198=== modified file 'tools/boot/cosmic/boot-amd64+mac'
199--- tools/boot/cosmic/boot-amd64+mac 2018-05-02 21:44:19 +0000
200+++ tools/boot/cosmic/boot-amd64+mac 2018-06-04 22:47:53 +0000
201@@ -173,7 +173,7 @@
202 HIDDEN_TIMEOUT=
203 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
204 case $PROJECT in
205- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate|ubuntu-budgie)
206+ ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate|ubuntu-budgie)
207 HIDDEN_TIMEOUT=2
208 ;;
209 mythbuntu)
210@@ -343,7 +343,7 @@
211 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
212 access-options=v1 v2 brltty m1
213 EOF
214-elif [ "$PROJECT" = xubuntu ]; then
215+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
216 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
217 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
218 access-options=v2 v3 brltty m2
219@@ -470,7 +470,7 @@
220 EOF
221 fi
222 fi
223-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
224+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
225 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
226 label ltsp=Install an LTSP server
227 replace ltsp=file=/cdrom/preseed/ltsp.seed
228
229=== modified file 'tools/boot/cosmic/boot-i386'
230--- tools/boot/cosmic/boot-i386 2018-05-02 21:44:19 +0000
231+++ tools/boot/cosmic/boot-i386 2018-06-04 22:47:53 +0000
232@@ -90,7 +90,7 @@
233 done
234
235 case $PROJECT in
236- xubuntu|lubuntu)
237+ xubuntu|xubuntu-base|lubuntu)
238 FLAVOUR=generic
239 ;;
240 ubuntustudio)
241@@ -191,7 +191,7 @@
242 HIDDEN_TIMEOUT=
243 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
244 case $PROJECT in
245- ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
246+ ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
247 HIDDEN_TIMEOUT=2
248 ;;
249 mythbuntu)
250@@ -369,7 +369,7 @@
251 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
252 access-options=v1 v2 brltty m1
253 EOF
254-elif [ "$PROJECT" = xubuntu ]; then
255+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
256 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
257 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
258 access-options=v2 v3 brltty m2
259@@ -501,7 +501,7 @@
260 EOF
261 fi
262 fi
263-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
264+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
265 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
266 label ltsp=Install an LTSP server
267 replace ltsp=file=/cdrom/preseed/ltsp.seed
268
269=== modified file 'tools/boot/cosmic/boot-powerpc'
270--- tools/boot/cosmic/boot-powerpc 2018-05-02 21:44:19 +0000
271+++ tools/boot/cosmic/boot-powerpc 2018-06-04 22:47:53 +0000
272@@ -184,7 +184,7 @@
273 if [ "$CDIMAGE_INSTALL_BASE" = 1 ] && [ "$PROJECT" != ubuntu-server ]; then
274 cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.cli
275 fi
276- if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
277+ if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = ubuntu-mate ]); then
278 cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.ltsp
279 fi
280 if [ "$CDIMAGE_LIVE" = 1 ]; then
281
282=== modified file 'tools/boot/cosmic/common.sh'
283--- tools/boot/cosmic/common.sh 2018-05-02 21:44:19 +0000
284+++ tools/boot/cosmic/common.sh 2018-06-04 22:47:53 +0000
285@@ -33,6 +33,9 @@
286 xubuntu)
287 DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu.seed'
288 ;;
289+ xubuntu-base)
290+ DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu-base.seed'
291+ ;;
292 ubuntu-server)
293 if [ "$CDIMAGE_LIVE" != 1 ]; then
294 DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-server.seed'
295
296=== modified file 'tools/boot/xenial/boot-amd64'
297--- tools/boot/xenial/boot-amd64 2017-02-21 04:29:37 +0000
298+++ tools/boot/xenial/boot-amd64 2018-06-04 22:47:53 +0000
299@@ -29,7 +29,7 @@
300 cd $CDDIR/..
301
302 #
303-# This script is called with $1 (now $N) as the CD to
304+# This script is called with $1 (now $N) as the CD to
305 # make bootable. N may be in the form "n" or "n_NONUS"
306 # There may be more than 4 disks...support extras.
307
308
309=== modified file 'tools/boot/xenial/boot-amd64+mac'
310--- tools/boot/xenial/boot-amd64+mac 2015-10-22 16:03:46 +0000
311+++ tools/boot/xenial/boot-amd64+mac 2018-06-04 22:47:53 +0000
312@@ -31,7 +31,7 @@
313 cd $CDDIR/..
314
315 #
316-# This script is called with $1 (now $N) as the CD to
317+# This script is called with $1 (now $N) as the CD to
318 # make bootable. N may be in the form "n" or "n_NONUS"
319 # There may be more than 4 disks...support extras.
320

Subscribers

People subscribed via source and target branches