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

Disentangle enabling universe in the final image a little from having

Browse Source 
PREINSTALLED=true set and enable it for a live-server build.
(LP: #1783129)
This commit is contained in:
Michael Hudson-Doyle 2018-08-28 10:32:07 +12:00
parent 52b22f61ab
commit a443abae28
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.525.8) UNRELEASED; urgency=medium
* Disentangle enabling universe in the final image a little from having
PREINSTALLED=true set and enable it for a live-server build.
(LP: #1783129)
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 16 Aug 2018 21:28:00 +1200
livecd-rootfs (2.525.7) bionic; urgency=medium livecd-rootfs (2.525.7) bionic; urgency=medium
* Disable journald rate limiting in the live-server live session. * Disable journald rate limiting in the live-server live session.

2
live-build/auto/build
View File

@ -237,7 +237,7 @@ EOF
rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old
Chroot chroot apt clean Chroot chroot apt clean
if [ -f config/oem-config-preinstalled ]; then if [ -f config/universe-enabled ]; then
# This is cargo-culted almost verbatim (with some syntax changes for # This is cargo-culted almost verbatim (with some syntax changes for
# preinstalled being slightly different in what it doesn't ask) from # preinstalled being slightly different in what it doesn't ask) from

7
live-build/auto/config
View File

@ -156,6 +156,7 @@ case $IMAGEFORMAT in
# by skipping lb_chroot_live-packages. # by skipping lb_chroot_live-packages.
skip_lb_stage chroot_live-packages skip_lb_stage chroot_live-packages
INITRAMFS_TYPE=auto INITRAMFS_TYPE=auto
touch config/universe-enabled
;; ;;
*) *)
PREINSTALLED=true PREINSTALLED=true
@ -218,9 +219,9 @@ case $IMAGEFORMAT in
esac esac
if [ "$PREINSTALLED" = "true" ]; then if [ "$PREINSTALLED" = "true" ]; then
# This is an oem-config preinstalled image, touch a random file that # Touch a random file that we can refer back to during build,
# we can refer back to during build, cause that's wildly hackish # cause that's wildly hackish
touch config/oem-config-preinstalled touch config/universe-enabled
case $PROJECT in case $PROJECT in
kubuntu*) kubuntu*)
add_package live oem-config-kde ubiquity-frontend-kde add_package live oem-config-kde ubiquity-frontend-kde