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

ubuntu/cosmic
Iain Lane 7 years ago
commit e68923777e

7
debian/changelog vendored

@ -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 livecd-rootfs (2.516) bionic; urgency=medium
[ Chris Glass ] [ Chris Glass ]

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

Loading…
Cancel
Save