=== 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 @@
 d-i	ltsp-client-builder/run	boolean true
 d-i	ltsp-client-builder/build-client-opts	string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
 # Enable extras.ubuntu.com.
-d-i	apt-setup/extras	boolean true
+d-i     apt-setup/extras        boolean true
 # Install the Xubuntu desktop and LTSP server.
 tasksel	tasksel/first	multiselect xubuntu-desktop
 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

=== 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 @@
 # Enable extras.ubuntu.com.
-d-i	apt-setup/extras	boolean true
+d-i     apt-setup/extras        boolean true
 # Install the Xubuntu desktop.
 tasksel	tasksel/first	multiselect xubuntu-desktop
 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

=== 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 @@
+# Build an LTSP client chroot.
+d-i	anna/choose_modules	string ltsp-client-builder
+d-i	ltsp-client-builder/run	boolean true
+d-i	ltsp-client-builder/build-client-opts	string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
+# Install the Xubuntu desktop and LTSP server.
+tasksel	tasksel/first	multiselect xubuntu-core
+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
+d-i	pkgsel/include/install-recommends	boolean true
+d-i	pkgsel/include	string ltsp-server-standalone openssh-server
+# No XFCE translation packages yet.
+d-i	pkgsel/language-pack-patterns	string
+# Build a client chroot.
+d-i	preseed/late_command	string chroot /target /usr/sbin/ltsp-update-sshkeys

=== 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 @@
+# Install the Xubuntu desktop.
+tasksel	tasksel/first	multiselect xubuntu-core
+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
+# No XFCE translation packages yet.
+d-i	pkgsel/language-pack-patterns	string

=== 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 @@
 d-i	anna/choose_modules	string ltsp-client-builder
 d-i	ltsp-client-builder/run	boolean true
 d-i	ltsp-client-builder/build-client-opts	string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
-# Enable extras.ubuntu.com.
-d-i	apt-setup/extras	boolean true
 # Install the Xubuntu desktop and LTSP server.
 tasksel	tasksel/first	multiselect xubuntu-desktop
 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

=== 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 @@
-# Enable extras.ubuntu.com.
-d-i	apt-setup/extras	boolean true
 # Install the Xubuntu desktop.
 tasksel	tasksel/first	multiselect xubuntu-desktop
 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

=== 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 @@
 d-i	ltsp-client-builder/run	boolean true
 d-i	ltsp-client-builder/build-client-opts	string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
 # Enable extras.ubuntu.com.
-d-i	apt-setup/extras	boolean true
+d-i     apt-setup/extras        boolean true
 # Install the Xubuntu desktop and LTSP server.
 tasksel	tasksel/first	multiselect xubuntu-desktop
 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

=== 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 @@
 # Enable extras.ubuntu.com.
-d-i	apt-setup/extras	boolean true
+d-i     apt-setup/extras        boolean true
 # Install the Xubuntu desktop.
 tasksel	tasksel/first	multiselect xubuntu-desktop
 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

=== modified file 'data/wily/xubuntu.pcx'
Binary 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 @@
 d-i	ltsp-client-builder/run	boolean true
 d-i	ltsp-client-builder/build-client-opts	string --mirror file:///cdrom --security-mirror none --skipimage --components main,restricted,universe
 # Enable extras.ubuntu.com.
-d-i	apt-setup/extras	boolean true
+d-i     apt-setup/extras        boolean true
 # Install the Xubuntu desktop and LTSP server.
 tasksel	tasksel/first	multiselect xubuntu-desktop
 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

=== 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 @@
 # Enable extras.ubuntu.com.
-d-i	apt-setup/extras	boolean true
+d-i     apt-setup/extras        boolean true
 # Install the Xubuntu desktop.
 tasksel	tasksel/first	multiselect xubuntu-desktop
 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

=== modified file 'data/xenial/xubuntu.pcx'
Binary 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 @@
 				RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=$PROJECT&ver=${DEBVERSION%% *}&lang=\${LANG}"
 				;;
 		esac
+	xubuntu-base)
+		RELEASE_NOTES="http://www.ubuntu.com/getubuntu/releasenotes?os=xubuntu&ver=${DEBVERSION%% *}&lang=\${LANG}"
 		;;
 esac
 if [ "$RELEASE_NOTES" ]; then

=== 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 @@
 cd $CDDIR/..
 
 #
-# This script is called with $1 (now $N) as the CD to 
+# This script is called with $1 (now $N) as the CD to
 # make bootable.  N may be in the form "n" or "n_NONUS"
 # There may be more than 4 disks...support extras.
 

=== 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 @@
 cd $CDDIR/..
 
 #
-# This script is called with $1 (now $N) as the CD to 
+# This script is called with $1 (now $N) as the CD to
 # make bootable.  N may be in the form "n" or "n_NONUS"
 # There may be more than 4 disks...support extras.
 

=== 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 @@
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v1 v2 brltty m1
 EOF
-elif [ "$PROJECT" = xubuntu ]; then
+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
     # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v2 v3 brltty m2
@@ -611,7 +611,7 @@
     done
     fi
 fi
-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 label ltsp=Install an LTSP server
 replace ltsp=file=/cdrom/preseed/ltsp.seed

=== 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 @@
 HIDDEN_TIMEOUT=
 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
     case $PROJECT in
-	ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate|ubuntu-budgie)
+	ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-mate|ubuntu-budgie)
 	    HIDDEN_TIMEOUT=2
 	    ;;
 	mythbuntu)
@@ -343,7 +343,7 @@
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v1 v2 brltty m1
 EOF
-elif [ "$PROJECT" = xubuntu ]; then
+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
     # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v2 v3 brltty m2
@@ -470,7 +470,7 @@
 EOF
     fi
 fi
-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 label ltsp=Install an LTSP server
 replace ltsp=file=/cdrom/preseed/ltsp.seed

=== 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 @@
 done
 
 case $PROJECT in
-    xubuntu|lubuntu)
+    xubuntu|xubuntu-base|lubuntu)
 	FLAVOUR=generic
 	;;
     ubuntustudio)
@@ -191,7 +191,7 @@
 HIDDEN_TIMEOUT=
 if [ "$CDIMAGE_LIVE" = 1 ] && [ "$CDIMAGE_DVD" != 1 ]; then
     case $PROJECT in
-	ubuntu|ubuntu-netbook|xubuntu|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
+	ubuntu|ubuntu-netbook|xubuntu|xubuntu-base|ubuntukylin|kubuntu|kubuntu-plasma5|ubuntu-gnome|ubuntu-desktop-next|ubuntu-mate|ubuntu-budgie)
 	    HIDDEN_TIMEOUT=2
 	    ;;
 	mythbuntu)
@@ -369,7 +369,7 @@
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v1 v2 brltty m1
 EOF
-elif [ "$PROJECT" = xubuntu ]; then
+elif [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ]; then
     # v1 and m1 don't have the necessary sed calls for Xubuntu yet.
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 access-options=v2 v3 brltty m2
@@ -501,7 +501,7 @@
 EOF
     fi
 fi
-if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
+if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = edubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
     cat >> boot$N/isolinux/gfxboot.cfg <<EOF
 label ltsp=Install an LTSP server
 replace ltsp=file=/cdrom/preseed/ltsp.seed

=== 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 @@
  if [ "$CDIMAGE_INSTALL_BASE" = 1 ] && [ "$PROJECT" != ubuntu-server ]; then
      cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.cli
  fi
- if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = ubuntu-mate ]); then
+ if [ "$CDIMAGE_INSTALL" = 1 ] && ([ "$PROJECT" = ubuntu ] || [ "$PROJECT" = xubuntu ] || [ "$PROJECT" = xubuntu-base ] || [ "$PROJECT" = ubuntu-mate ]); then
      cat $BASEDIR/data/$CODENAME/yaboot/yaboot.conf.ltsp
  fi
  if [ "$CDIMAGE_LIVE" = 1 ]; then

=== 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 @@
 	xubuntu)
 	    DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu.seed'
 	    ;;
+	xubuntu-base)
+	    DEFAULT_PRESEED='file=/cdrom/preseed/xubuntu-base.seed'
+	    ;;
 	ubuntu-server)
 	    if [ "$CDIMAGE_LIVE" != 1 ]; then
 		DEFAULT_PRESEED='file=/cdrom/preseed/ubuntu-server.seed'

=== 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 @@
 cd $CDDIR/..
 
 #
-# This script is called with $1 (now $N) as the CD to 
+# This script is called with $1 (now $N) as the CD to
 # make bootable.  N may be in the form "n" or "n_NONUS"
 # There may be more than 4 disks...support extras.
 

=== 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 @@
 cd $CDDIR/..
 
 #
-# This script is called with $1 (now $N) as the CD to 
+# This script is called with $1 (now $N) as the CD to
 # make bootable.  N may be in the form "n" or "n_NONUS"
 # There may be more than 4 disks...support extras.