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
Adam Conrad 2018-07-02 Pending
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.
Sean Davis (bluesabre) wrote :

Hello Adam (and the Ubuntu CD Image Team). It's been a few weeks since we last spoke on this subject. Would you mind taking a looking at these three branches and consider including them for Cosmic?

Sean Davis (bluesabre) wrote :

Hello again. It's been another month since I last checked on this. Can we please get a review and possible merge for these branches? We are unable to move forward with this project until this is done.

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
=== modified file 'data/bionic/preseed/xubuntu/ltsp.seed'
--- data/bionic/preseed/xubuntu/ltsp.seed 2017-11-08 04:58:14 +0000
+++ data/bionic/preseed/xubuntu/ltsp.seed 2018-06-04 22:47:53 +0000
@@ -3,7 +3,7 @@
3d-i ltsp-client-builder/run boolean true3d-i ltsp-client-builder/run boolean true
4d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe4d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
5# Enable extras.ubuntu.com.5# Enable extras.ubuntu.com.
6d-i apt-setup/extras boolean true6d-i apt-setup/extras boolean true
7# Install the Xubuntu desktop and LTSP server.7# Install the Xubuntu desktop and LTSP server.
8tasksel tasksel/first multiselect xubuntu-desktop8tasksel tasksel/first multiselect xubuntu-desktop
9d-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 ;; esac9d-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
1010
=== modified file 'data/bionic/preseed/xubuntu/xubuntu.seed'
--- data/bionic/preseed/xubuntu/xubuntu.seed 2017-11-08 04:58:14 +0000
+++ data/bionic/preseed/xubuntu/xubuntu.seed 2018-06-04 22:47:53 +0000
@@ -1,5 +1,5 @@
1# Enable extras.ubuntu.com.1# Enable extras.ubuntu.com.
2d-i apt-setup/extras boolean true2d-i apt-setup/extras boolean true
3# Install the Xubuntu desktop.3# Install the Xubuntu desktop.
4tasksel tasksel/first multiselect xubuntu-desktop4tasksel tasksel/first multiselect xubuntu-desktop
5d-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 ;; esac5d-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
=== added directory 'data/cosmic/preseed/xubuntu-base'
=== added file 'data/cosmic/preseed/xubuntu-base/ltsp.seed'
--- data/cosmic/preseed/xubuntu-base/ltsp.seed 1970-01-01 00:00:00 +0000
+++ data/cosmic/preseed/xubuntu-base/ltsp.seed 2018-06-04 22:47:53 +0000
@@ -0,0 +1,13 @@
1# Build an LTSP client chroot.
2d-i anna/choose_modules string ltsp-client-builder
3d-i ltsp-client-builder/run boolean true
4d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
5# Install the Xubuntu desktop and LTSP server.
6tasksel tasksel/first multiselect xubuntu-core
7d-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
8d-i pkgsel/include/install-recommends boolean true
9d-i pkgsel/include string ltsp-server-standalone openssh-server
10# No XFCE translation packages yet.
11d-i pkgsel/language-pack-patterns string
12# Build a client chroot.
13d-i preseed/late_command string chroot /target /usr/sbin/ltsp-update-sshkeys
014
=== added file 'data/cosmic/preseed/xubuntu-base/xubuntu-base.seed'
--- data/cosmic/preseed/xubuntu-base/xubuntu-base.seed 1970-01-01 00:00:00 +0000
+++ data/cosmic/preseed/xubuntu-base/xubuntu-base.seed 2018-06-04 22:47:53 +0000
@@ -0,0 +1,5 @@
1# Install the Xubuntu desktop.
2tasksel tasksel/first multiselect xubuntu-core
3d-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
4# No XFCE translation packages yet.
5d-i pkgsel/language-pack-patterns string
06
=== modified file 'data/cosmic/preseed/xubuntu/ltsp.seed'
--- data/cosmic/preseed/xubuntu/ltsp.seed 2018-05-02 21:44:19 +0000
+++ data/cosmic/preseed/xubuntu/ltsp.seed 2018-06-04 22:47:53 +0000
@@ -2,8 +2,6 @@
2d-i anna/choose_modules string ltsp-client-builder2d-i anna/choose_modules string ltsp-client-builder
3d-i ltsp-client-builder/run boolean true3d-i ltsp-client-builder/run boolean true
4d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe4d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
5# Enable extras.ubuntu.com.
6d-i apt-setup/extras boolean true
7# Install the Xubuntu desktop and LTSP server.5# Install the Xubuntu desktop and LTSP server.
8tasksel tasksel/first multiselect xubuntu-desktop6tasksel tasksel/first multiselect xubuntu-desktop
9d-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 ;; esac7d-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
=== modified file 'data/cosmic/preseed/xubuntu/xubuntu.seed'
--- data/cosmic/preseed/xubuntu/xubuntu.seed 2018-05-02 21:44:19 +0000
+++ data/cosmic/preseed/xubuntu/xubuntu.seed 2018-06-04 22:47:53 +0000
@@ -1,5 +1,3 @@
1# Enable extras.ubuntu.com.
2d-i apt-setup/extras boolean true
3# Install the Xubuntu desktop.1# Install the Xubuntu desktop.
4tasksel tasksel/first multiselect xubuntu-desktop2tasksel tasksel/first multiselect xubuntu-desktop
5d-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 ;; esac3d-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
64
=== added symlink 'data/cosmic/xubuntu-base-access.pcx'
=== target is u'xubuntu-access.pcx'
=== added symlink 'data/cosmic/xubuntu-base-blank.pcx'
=== target is u'xubuntu-blank.pcx'
=== added symlink 'data/cosmic/xubuntu-base.pcx'
=== target is u'xubuntu.pcx'
=== added symlink 'data/cosmic/xubuntu-base.png'
=== target is u'xubuntu.png'
=== modified file 'data/wily/preseed/xubuntu/ltsp.seed'
--- data/wily/preseed/xubuntu/ltsp.seed 2015-05-08 05:28:37 +0000
+++ data/wily/preseed/xubuntu/ltsp.seed 2018-06-04 22:47:53 +0000
@@ -3,7 +3,7 @@
3d-i ltsp-client-builder/run boolean true3d-i ltsp-client-builder/run boolean true
4d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe4d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
5# Enable extras.ubuntu.com.5# Enable extras.ubuntu.com.
6d-i apt-setup/extras boolean true6d-i apt-setup/extras boolean true
7# Install the Xubuntu desktop and LTSP server.7# Install the Xubuntu desktop and LTSP server.
8tasksel tasksel/first multiselect xubuntu-desktop8tasksel tasksel/first multiselect xubuntu-desktop
9d-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 ;; esac9d-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
1010
=== modified file 'data/wily/preseed/xubuntu/xubuntu.seed'
--- data/wily/preseed/xubuntu/xubuntu.seed 2015-05-08 05:28:37 +0000
+++ data/wily/preseed/xubuntu/xubuntu.seed 2018-06-04 22:47:53 +0000
@@ -1,5 +1,5 @@
1# Enable extras.ubuntu.com.1# Enable extras.ubuntu.com.
2d-i apt-setup/extras boolean true2d-i apt-setup/extras boolean true
3# Install the Xubuntu desktop.3# Install the Xubuntu desktop.
4tasksel tasksel/first multiselect xubuntu-desktop4tasksel tasksel/first multiselect xubuntu-desktop
5d-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 ;; esac5d-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
=== modified file 'data/wily/xubuntu.pcx'
7Binary files data/wily/xubuntu.pcx 2015-05-08 05:28:37 +0000 and data/wily/xubuntu.pcx 2018-06-04 22:47:53 +0000 differ7Binary 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
=== modified file 'data/xenial/preseed/xubuntu/ltsp.seed'
--- data/xenial/preseed/xubuntu/ltsp.seed 2015-10-22 16:03:46 +0000
+++ data/xenial/preseed/xubuntu/ltsp.seed 2018-06-04 22:47:53 +0000
@@ -3,7 +3,7 @@
3d-i ltsp-client-builder/run boolean true3d-i ltsp-client-builder/run boolean true
4d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe4d-i ltsp-client-builder/build-client-opts string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
5# Enable extras.ubuntu.com.5# Enable extras.ubuntu.com.
6d-i apt-setup/extras boolean true6d-i apt-setup/extras boolean true
7# Install the Xubuntu desktop and LTSP server.7# Install the Xubuntu desktop and LTSP server.
8tasksel tasksel/first multiselect xubuntu-desktop8tasksel tasksel/first multiselect xubuntu-desktop
9d-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 ;; esac9d-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
1010
=== modified file 'data/xenial/preseed/xubuntu/xubuntu.seed'
--- data/xenial/preseed/xubuntu/xubuntu.seed 2015-10-22 16:03:46 +0000
+++ data/xenial/preseed/xubuntu/xubuntu.seed 2018-06-04 22:47:53 +0000
@@ -1,5 +1,5 @@
1# Enable extras.ubuntu.com.1# Enable extras.ubuntu.com.
2d-i apt-setup/extras boolean true2d-i apt-setup/extras boolean true
3# Install the Xubuntu desktop.3# Install the Xubuntu desktop.
4tasksel tasksel/first multiselect xubuntu-desktop4tasksel tasksel/first multiselect xubuntu-desktop
5d-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 ;; esac5d-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
=== modified file 'data/xenial/xubuntu.pcx'
7Binary files data/xenial/xubuntu.pcx 2015-10-22 16:03:46 +0000 and data/xenial/xubuntu.pcx 2018-06-04 22:47:53 +0000 differ7Binary 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
=== modified file 'tools/add_live_filesystem'
--- tools/add_live_filesystem 2018-04-10 09:06:11 +0000
+++ tools/add_live_filesystem 2018-06-04 22:47:53 +0000
@@ -134,6 +134,8 @@
134 RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=$PROJECT&ver=${DEBVERSION%% *}&lang=\${LANG}"134 RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=$PROJECT&ver=${DEBVERSION%% *}&lang=\${LANG}"
135 ;;135 ;;
136 esac136 esac
137 xubuntu-base)
138 RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=xubuntu&ver=${DEBVERSION%% *}&lang=\${LANG}"
137 ;;139 ;;
138esac140esac
139if [ "$RELEASE_NOTES" ]; then141if [ "$RELEASE_NOTES" ]; then
140142
=== modified file 'tools/boot/bionic/boot-amd64'
--- tools/boot/bionic/boot-amd64 2018-03-03 07:07:57 +0000
+++ tools/boot/bionic/boot-amd64 2018-06-04 22:47:53 +0000
@@ -29,7 +29,7 @@
29cd $CDDIR/..29cd $CDDIR/..
3030
31#31#
32# This script is called with $1 (now $N) as the CD to 32# This script is called with $1 (now $N) as the CD to
33# make bootable. N may be in the form "n" or "n_NONUS"33# make bootable. N may be in the form "n" or "n_NONUS"
34# There may be more than 4 disks...support extras.34# There may be more than 4 disks...support extras.
3535
3636
=== modified file 'tools/boot/bionic/boot-amd64+mac'
--- tools/boot/bionic/boot-amd64+mac 2017-11-08 04:58:14 +0000
+++ tools/boot/bionic/boot-amd64+mac 2018-06-04 22:47:53 +0000
@@ -31,7 +31,7 @@
31cd $CDDIR/..31cd $CDDIR/..
3232
33#33#
34# This script is called with $1 (now $N) as the CD to 34# This script is called with $1 (now $N) as the CD to
35# make bootable. N may be in the form "n" or "n_NONUS"35# make bootable. N may be in the form "n" or "n_NONUS"
36# There may be more than 4 disks...support extras.36# There may be more than 4 disks...support extras.
3737
3838
=== modified file 'tools/boot/cosmic/boot-amd64'
--- tools/boot/cosmic/boot-amd64 2018-05-02 21:44:19 +0000
+++ tools/boot/cosmic/boot-amd64 2018-06-04 22:47:53 +0000
@@ -406,7 +406,7 @@
406 cat >> boot$N/isolinux/gfxboot.cfg <<EOF406 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
407access-options=v1 v2 brltty m1407access-options=v1 v2 brltty m1
408EOF408EOF
409elif [ "$PROJECT" = xubuntu ]; then409elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
410 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.410 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
411 cat >> boot$N/isolinux/gfxboot.cfg <<EOF411 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
412access-options=v2 v3 brltty m2412access-options=v2 v3 brltty m2
@@ -611,7 +611,7 @@
611 done611 done
612 fi612 fi
613fi613fi
614if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then614if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
615 cat >> boot$N/isolinux/gfxboot.cfg <<EOF615 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
616label ltsp=Install an LTSP server616label ltsp=Install an LTSP server
617replace ltsp=file=/cdrom/preseed/ltsp.seed617replace ltsp=file=/cdrom/preseed/ltsp.seed
618618
=== modified file 'tools/boot/cosmic/boot-amd64+mac'
--- tools/boot/cosmic/boot-amd64+mac 2018-05-02 21:44:19 +0000
+++ tools/boot/cosmic/boot-amd64+mac 2018-06-04 22:47:53 +0000
@@ -173,7 +173,7 @@
173HIDDEN_TIMEOUT=173HIDDEN_TIMEOUT=
174if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then174if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
175 case $PROJECT in175 case $PROJECT in
176 ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate|ubuntu-budgie)176 ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate|ubuntu-budgie)
177 HIDDEN_TIMEOUT=2177 HIDDEN_TIMEOUT=2
178 ;;178 ;;
179 mythbuntu)179 mythbuntu)
@@ -343,7 +343,7 @@
343 cat >> boot$N/isolinux/gfxboot.cfg <<EOF343 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
344access-options=v1 v2 brltty m1344access-options=v1 v2 brltty m1
345EOF345EOF
346elif [ "$PROJECT" = xubuntu ]; then346elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
347 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.347 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
348 cat >> boot$N/isolinux/gfxboot.cfg <<EOF348 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
349access-options=v2 v3 brltty m2349access-options=v2 v3 brltty m2
@@ -470,7 +470,7 @@
470EOF470EOF
471 fi471 fi
472fi472fi
473if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then473if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
474 cat >> boot$N/isolinux/gfxboot.cfg <<EOF474 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
475label ltsp=Install an LTSP server475label ltsp=Install an LTSP server
476replace ltsp=file=/cdrom/preseed/ltsp.seed476replace ltsp=file=/cdrom/preseed/ltsp.seed
477477
=== modified file 'tools/boot/cosmic/boot-i386'
--- tools/boot/cosmic/boot-i386 2018-05-02 21:44:19 +0000
+++ tools/boot/cosmic/boot-i386 2018-06-04 22:47:53 +0000
@@ -90,7 +90,7 @@
90done90done
9191
92case $PROJECT in92case $PROJECT in
93 xubuntu|lubuntu)93 xubuntu|xubuntu-base|lubuntu)
94 FLAVOUR=generic94 FLAVOUR=generic
95 ;;95 ;;
96 ubuntustudio)96 ubuntustudio)
@@ -191,7 +191,7 @@
191HIDDEN_TIMEOUT=191HIDDEN_TIMEOUT=
192if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then192if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
193 case $PROJECT in193 case $PROJECT in
194 ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)194 ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
195 HIDDEN_TIMEOUT=2195 HIDDEN_TIMEOUT=2
196 ;;196 ;;
197 mythbuntu)197 mythbuntu)
@@ -369,7 +369,7 @@
369 cat >> boot$N/isolinux/gfxboot.cfg <<EOF369 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
370access-options=v1 v2 brltty m1370access-options=v1 v2 brltty m1
371EOF371EOF
372elif [ "$PROJECT" = xubuntu ]; then372elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
373 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.373 # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
374 cat >> boot$N/isolinux/gfxboot.cfg <<EOF374 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
375access-options=v2 v3 brltty m2375access-options=v2 v3 brltty m2
@@ -501,7 +501,7 @@
501EOF501EOF
502 fi502 fi
503fi503fi
504if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then504if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
505 cat >> boot$N/isolinux/gfxboot.cfg <<EOF505 cat >> boot$N/isolinux/gfxboot.cfg <<EOF
506label ltsp=Install an LTSP server506label ltsp=Install an LTSP server
507replace ltsp=file=/cdrom/preseed/ltsp.seed507replace ltsp=file=/cdrom/preseed/ltsp.seed
508508
=== modified file 'tools/boot/cosmic/boot-powerpc'
--- tools/boot/cosmic/boot-powerpc 2018-05-02 21:44:19 +0000
+++ tools/boot/cosmic/boot-powerpc 2018-06-04 22:47:53 +0000
@@ -184,7 +184,7 @@
184 if [ "$CDIMAGE_INSTALL_BASE" = 1 ] && [ "$PROJECT" != ubuntu-server ]; then184 if [ "$CDIMAGE_INSTALL_BASE" = 1 ] && [ "$PROJECT" != ubuntu-server ]; then
185 cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.cli185 cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.cli
186 fi186 fi
187 if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then187 if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = ubuntu-mate ]); then
188 cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.ltsp188 cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.ltsp
189 fi189 fi
190 if [ "$CDIMAGE_LIVE" = 1 ]; then190 if [ "$CDIMAGE_LIVE" = 1 ]; then
191191
=== modified file 'tools/boot/cosmic/common.sh'
--- tools/boot/cosmic/common.sh 2018-05-02 21:44:19 +0000
+++ tools/boot/cosmic/common.sh 2018-06-04 22:47:53 +0000
@@ -33,6 +33,9 @@
33 xubuntu)33 xubuntu)
34 DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu.seed'34 DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu.seed'
35 ;;35 ;;
36 xubuntu-base)
37 DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu-base.seed'
38 ;;
36 ubuntu-server)39 ubuntu-server)
37 if [ "$CDIMAGE_LIVE" != 1 ]; then40 if [ "$CDIMAGE_LIVE" != 1 ]; then
38 DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-server.seed'41 DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-server.seed'
3942
=== modified file 'tools/boot/xenial/boot-amd64'
--- tools/boot/xenial/boot-amd64 2017-02-21 04:29:37 +0000
+++ tools/boot/xenial/boot-amd64 2018-06-04 22:47:53 +0000
@@ -29,7 +29,7 @@
29cd $CDDIR/..29cd $CDDIR/..
3030
31#31#
32# This script is called with $1 (now $N) as the CD to 32# This script is called with $1 (now $N) as the CD to
33# make bootable. N may be in the form "n" or "n_NONUS"33# make bootable. N may be in the form "n" or "n_NONUS"
34# There may be more than 4 disks...support extras.34# There may be more than 4 disks...support extras.
3535
3636
=== modified file 'tools/boot/xenial/boot-amd64+mac'
--- tools/boot/xenial/boot-amd64+mac 2015-10-22 16:03:46 +0000
+++ tools/boot/xenial/boot-amd64+mac 2018-06-04 22:47:53 +0000
@@ -31,7 +31,7 @@
31cd $CDDIR/..31cd $CDDIR/..
3232
33#33#
34# This script is called with $1 (now $N) as the CD to 34# This script is called with $1 (now $N) as the CD to
35# make bootable. N may be in the form "n" or "n_NONUS"35# make bootable. N may be in the form "n" or "n_NONUS"
36# There may be more than 4 disks...support extras.36# There may be more than 4 disks...support extras.
3737

Subscribers

People subscribed via source and target branches