merge lp:~tsimonq2/livecd-rootfs/lubuntu-seed-mangling

This commit is contained in:
Iain Lane 2018-04-03 11:56:28 +01:00
commit e68923777e
2 changed files with 14 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.517) UNRELEASED; urgency=medium
[ Simon Quigley ]
* Add proper lubuntu support in BASE_SEED.
-- Iain Lane <iain.lane@canonical.com> Tue, 03 Apr 2018 11:32:08 +0100
livecd-rootfs (2.516) bionic; urgency=medium
[ Chris Glass ]

View File

@ -667,9 +667,15 @@ esac
# we'll expand the base seed given here according to the STRUCTURE file, and
# then look in all of the seeds found to see which snaps are seeded
case $PROJECT:${SUBPROJECT:-} in
ubuntu:*|kubuntu*:*|lubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*)
ubuntu:*|kubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*)
BASE_SEED='desktop'
;;
lubuntu-next:*)
BASE_SEED='desktop-qt'
;;
lubuntu:*)
BASE_SEED='desktop-gtk'
;;
ubuntu-server:live)
BASE_SEED='server'
# subiquity is seeded but in a separate squashfs via hooks; set HOOK_SNAPS and ALL_SNAPS.