Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-17 13:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge trunk

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2018-05-22 11:44:36 +12:00
commit 038b003da0
3 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,10 +1,14 @@
livecd-rootfs (2.526) UNRELEASED; urgency=medium livecd-rootfs (2.527) UNRELEASED; urgency=medium
* Symlink systemd-networkd-wait-online to /bin/true in the live installer * Symlink systemd-networkd-wait-online to /bin/true in the live installer
live session to avoid depending on buggy systemd behaviour. live session to avoid depending on buggy systemd behaviour.
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Mon, 30 Apr 2018 20:00:02 +1200 -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Mon, 30 Apr 2018 20:00:02 +1200
livecd-rootfs (2.526) cosmic; urgency=medium
-- Simon Quigley <tsimonq2@ubuntu.com> Thu, 03 May 2018 23:18:52 -0500
livecd-rootfs (2.525) bionic; urgency=medium livecd-rootfs (2.525) bionic; urgency=medium
* Don't fail to build CPC images if /lib/modules already exists in the * Don't fail to build CPC images if /lib/modules already exists in the

1
debian/tests/default-bootstraps vendored
View File

@ -21,7 +21,6 @@ ALL_TRIPLETS="
kubuntu-dvd:: kubuntu-dvd::
kubuntu-plasma5:: kubuntu-plasma5::
lubuntu:: lubuntu::
lubuntu-next::
mythbuntu:: mythbuntu::
ubuntu:: ubuntu::
ubuntu-base:: ubuntu-base::

30
live-build/auto/config
View File

@ -323,7 +323,7 @@ if ! [ -e config/germinate-output/structure ]; then
fi fi
case $PROJECT in case $PROJECT in
base|edubuntu|edubuntu-dvd|kubuntu|kubuntu-active|kubuntu-dvd|kubuntu-plasma5|lubuntu|lubuntu-next|mythbuntu|ubuntu|ubuntu-budgie|ubuntu-desktop-next|ubuntu-dvd|ubuntu-gnome|ubuntu-mate|ubuntu-netbook|ubuntukylin|ubuntustudio-dvd|xubuntu) base|edubuntu|edubuntu-dvd|kubuntu|kubuntu-active|kubuntu-dvd|kubuntu-plasma5|lubuntu|mythbuntu|ubuntu|ubuntu-budgie|ubuntu-desktop-next|ubuntu-dvd|ubuntu-gnome|ubuntu-mate|ubuntu-netbook|ubuntukylin|ubuntustudio-dvd|xubuntu)
INITRAMFS_COMPRESSION="lzma" INITRAMFS_COMPRESSION="lzma"
;; ;;
esac esac
@ -432,26 +432,6 @@ case $PROJECT in
case $ARCH in case $ARCH in
amd64|i386) KERNEL_FLAVOURS=generic ;; amd64|i386) KERNEL_FLAVOURS=generic ;;
esac esac
# The Lubuntu STRUCTURE file has "feature
# no-follow-recommends". Mirror this.
APT_OPTIONS="${APT_OPTIONS} --no-install-recommends"
;;
lubuntu-next)
add_task install minimal standard lubuntu-qt-desktop
LIVE_TASK='lubuntu-live-qt'
case $ARCH in
amd64) add_package live linux-signed-generic ;;
esac
COMPONENTS='main restricted universe multiverse'
case $ARCH in
amd64|i386) KERNEL_FLAVOURS=generic ;;
esac
# The Lubuntu STRUCTURE file has "feature
# no-follow-recommends". Mirror this.
APT_OPTIONS="${APT_OPTIONS} --no-install-recommends"
;; ;;
ubuntu-gnome) ubuntu-gnome)
@ -671,15 +651,9 @@ 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*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*) ubuntu:*|kubuntu*:*|lubuntu*:*|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.