From c99354fc3fda758cd76132c2de52171626104808 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 28 Aug 2018 11:03:37 +1200 Subject: [PATCH] Import patches-unapplied version 2.525.8 to ubuntu/bionic-proposed Imported using git-ubuntu import. Changelog parent: 98b83185804075292116e23f65f0d6550e6df5d2 New changelog entries: * Disentangle enabling universe in the final image a little from having PREINSTALLED=true set and enable it for a live-server build. (LP: #1783129) * Fix live-server journald config snippet to actually disable journald rate limiting. --- debian/changelog | 10 ++++++++++ live-build/auto/build | 2 +- live-build/auto/config | 7 ++++--- .../etc/systemd/journald.conf.d/no-rate-limit.conf | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index cc9a0031..995bee54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +livecd-rootfs (2.525.8) bionic; 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) + * Fix live-server journald config snippet to actually disable journald rate + limiting. + + -- Michael Hudson-Doyle Tue, 28 Aug 2018 11:03:37 +1200 + livecd-rootfs (2.525.7) bionic; urgency=medium * Disable journald rate limiting in the live-server live session. diff --git a/live-build/auto/build b/live-build/auto/build index 4a26f05a..110478a5 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -237,7 +237,7 @@ EOF rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old 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 # preinstalled being slightly different in what it doesn't ask) from diff --git a/live-build/auto/config b/live-build/auto/config index 52b88b70..dc3a8282 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -156,6 +156,7 @@ case $IMAGEFORMAT in # by skipping lb_chroot_live-packages. skip_lb_stage chroot_live-packages INITRAMFS_TYPE=auto + touch config/universe-enabled ;; *) PREINSTALLED=true @@ -218,9 +219,9 @@ case $IMAGEFORMAT in esac if [ "$PREINSTALLED" = "true" ]; then - # This is an oem-config preinstalled image, touch a random file that - # we can refer back to during build, cause that's wildly hackish - touch config/oem-config-preinstalled + # Touch a random file that we can refer back to during build, + # cause that's wildly hackish + touch config/universe-enabled case $PROJECT in kubuntu*) add_package live oem-config-kde ubiquity-frontend-kde diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf index 1d8af89a..fbaab956 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf +++ b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf @@ -1 +1,2 @@ +[Journal] RateLimitIntervalSec=0