From eca9613bf380d6cac446143bafd6329b1dbdccf1 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Mon, 30 Apr 2018 20:01:54 +1200 Subject: [PATCH 01/54] Symlink systemd-networkd-wait-online to /bin/true in the live installer live session to avoid depending on buggy systemd behaviour. --- debian/changelog | 7 +++++++ .../overlay/lib/systemd/systemd-networkd-wait-online | 1 + 2 files changed, 8 insertions(+) create mode 120000 live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online diff --git a/debian/changelog b/debian/changelog index 817e0429..10ac754c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.526) UNRELEASED; urgency=medium + + * Symlink systemd-networkd-wait-online to /bin/true in the live installer + live session to avoid depending on buggy systemd behaviour. + + -- Michael Hudson-Doyle Mon, 30 Apr 2018 20:00:02 +1200 + livecd-rootfs (2.525) bionic; urgency=medium * Don't fail to build CPC images if /lib/modules already exists in the diff --git a/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online new file mode 120000 index 00000000..63b10de4 --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/lib/systemd/systemd-networkd-wait-online @@ -0,0 +1 @@ +/bin/true \ No newline at end of file From 480e02443e7ae35e70e75648cf8d5069921855ee Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Thu, 3 May 2018 23:08:44 -0500 Subject: [PATCH 02/54] Drop seed workarounds for unbuilt Lubuntu Next. --- live-build/auto/config | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index e07aeb85..f66dfc07 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -671,15 +671,9 @@ 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*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*) + ubuntu:*|kubuntu*:*|lubuntu*:*|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. From 0f073af40323fa212dafaed7061899693a67a560 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Thu, 3 May 2018 23:19:45 -0500 Subject: [PATCH 03/54] Add a changelog entry. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 817e0429..6e38cb8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.526) UNRELEASED; urgency=medium + + * Drop the workaround for setting the base seed of Lubuntu and Lubuntu Next + now that Lubuntu Next is Lubuntu. + + -- Simon Quigley Thu, 03 May 2018 23:18:52 -0500 + livecd-rootfs (2.525) bionic; urgency=medium * Don't fail to build CPC images if /lib/modules already exists in the From 382f17b08cd46da082140fbe4aa86f81ff44aa18 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Thu, 3 May 2018 23:23:30 -0500 Subject: [PATCH 04/54] Don't follow recommends. --- debian/changelog | 2 ++ live-build/auto/config | 8 -------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6e38cb8a..caf3415b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ livecd-rootfs (2.526) UNRELEASED; urgency=medium * Drop the workaround for setting the base seed of Lubuntu and Lubuntu Next now that Lubuntu Next is Lubuntu. + * Don't follow recommends on Lubuntu now that this is no longer the + case in the seed. -- Simon Quigley Thu, 03 May 2018 23:18:52 -0500 diff --git a/live-build/auto/config b/live-build/auto/config index f66dfc07..10f288ab 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -432,10 +432,6 @@ case $PROJECT in 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" ;; lubuntu-next) @@ -448,10 +444,6 @@ case $PROJECT in 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) From 9ba04172d4010dea59755eb014a67e374d560f6e Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 8 May 2018 21:12:15 -0500 Subject: [PATCH 05/54] Completely drop Lubuntu Next. --- debian/changelog | 3 +-- debian/tests/default-bootstraps | 1 - live-build/auto/config | 14 +------------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index caf3415b..0d89af0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,6 @@ livecd-rootfs (2.526) UNRELEASED; urgency=medium - * Drop the workaround for setting the base seed of Lubuntu and Lubuntu Next - now that Lubuntu Next is Lubuntu. + * Drop Lubuntu Next now that Lubuntu Next is Lubuntu. * Don't follow recommends on Lubuntu now that this is no longer the case in the seed. diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 433cd327..0c0062a6 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -21,7 +21,6 @@ ALL_TRIPLETS=" kubuntu-dvd:: kubuntu-plasma5:: lubuntu:: - lubuntu-next:: mythbuntu:: ubuntu:: ubuntu-base:: diff --git a/live-build/auto/config b/live-build/auto/config index 10f288ab..069a69dc 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -323,7 +323,7 @@ if ! [ -e config/germinate-output/structure ]; then fi 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" ;; esac @@ -434,18 +434,6 @@ case $PROJECT in esac ;; - 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 - ;; - ubuntu-gnome) add_task install minimal standard ubuntu-gnome-desktop LIVE_TASK='ubuntu-gnome-live' From 021ffbbf16302bf9ccf19d439ea67dc64d0815ab Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Wed, 16 May 2018 15:11:32 -0600 Subject: [PATCH 06/54] Release 2.526 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0d89af0f..e3aa5680 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.526) UNRELEASED; urgency=medium +livecd-rootfs (2.526) cosmic; urgency=medium * Drop Lubuntu Next now that Lubuntu Next is Lubuntu. * Don't follow recommends on Lubuntu now that this is no longer the From 4bee7b18986b2d5e36c04db5cc2217ff3a47a1dc Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 22 May 2018 11:42:39 +1200 Subject: [PATCH 07/54] remove "optional: true" from 00-installer-config.yaml --- .../overlay/etc/netplan/00-installer-config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml b/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml index bfa19a26..b8399cb6 100644 --- a/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml +++ b/live-build/ubuntu-server/includes.binary/overlay/etc/netplan/00-installer-config.yaml @@ -7,9 +7,7 @@ network: match: name: "en*" dhcp4: true - optional: true all-eth: match: name: "eth*" dhcp4: true - optional: true From 7ff90045b2afd060c468929907637c7015105f84 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 22 May 2018 11:45:10 +1200 Subject: [PATCH 08/54] update changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index bebfcefa..88657bbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ livecd-rootfs (2.527) UNRELEASED; urgency=medium * Symlink systemd-networkd-wait-online to /bin/true in the live installer live session to avoid depending on buggy systemd behaviour. + * Remove "optional: true" from installer netplan config. -- Michael Hudson-Doyle Mon, 30 Apr 2018 20:00:02 +1200 From 7c4d8ca173e7f3ce12349ce0eda0fff5a8899575 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 23 May 2018 14:26:02 +1200 Subject: [PATCH 09/54] fix mis-merge --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 88657bbd..1f9beeb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ livecd-rootfs (2.527) UNRELEASED; urgency=medium livecd-rootfs (2.526) cosmic; urgency=medium + * Drop Lubuntu Next now that Lubuntu Next is Lubuntu. + * Don't follow recommends on Lubuntu now that this is no longer the + case in the seed. + -- Simon Quigley Thu, 03 May 2018 23:18:52 -0500 livecd-rootfs (2.525) bionic; urgency=medium From 9c4028cc859e39c2759c72341394dc451cdb56d6 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 23 May 2018 14:27:08 +1200 Subject: [PATCH 10/54] releasing package livecd-rootfs version 2.527 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1f9beeb7..e563adb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -livecd-rootfs (2.527) UNRELEASED; urgency=medium +livecd-rootfs (2.527) cosmic; urgency=medium * Symlink systemd-networkd-wait-online to /bin/true in the live installer live session to avoid depending on buggy systemd behaviour. * Remove "optional: true" from installer netplan config. - -- Michael Hudson-Doyle Mon, 30 Apr 2018 20:00:02 +1200 + -- Michael Hudson-Doyle Wed, 23 May 2018 14:27:01 +1200 livecd-rootfs (2.526) cosmic; urgency=medium From 056e760c06b2b5353743fbfaa587c31f9ee4f6c2 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 28 May 2018 10:39:06 -0400 Subject: [PATCH 11/54] Don't divert grub-probe; otherwise we're missing the filesystem UUIDs that the grub search command needs to find the right prefix/root. This is different than the PARTUUID for booting initrd-less. --- debian/changelog | 8 ++++++++ live-build/functions | 11 +++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index e563adb6..33961537 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.528) UNRELEASED; urgency=medium + + * Don't divert grub-probe; otherwise we're missing the filesystem UUIDs that + the grub search command needs to find the right prefix/root. This is + different than the PARTUUID for booting initrd-less. + + -- Mathieu Trudel-Lapierre Mon, 28 May 2018 10:36:18 -0400 + livecd-rootfs (2.527) cosmic; urgency=medium * Symlink systemd-networkd-wait-online to /bin/true in the live installer diff --git a/live-build/functions b/live-build/functions index 3363bf2a..4441f2b1 100644 --- a/live-build/functions +++ b/live-build/functions @@ -296,10 +296,9 @@ replace_grub_root_with_label() { divert_grub() { CHROOT_ROOT="$1" - chroot "$CHROOT_ROOT" dpkg-divert --local \ - --rename /usr/sbin/grub-probe - chroot "$CHROOT_ROOT" touch /usr/sbin/grub-probe - chroot "$CHROOT_ROOT" chmod +x /usr/sbin/grub-probe + # Don't divert all of grub-probe here; just the scripts we don't want + # running. Otherwise, you may be missing part-uuids for the search + # command, for example. ~cyphermox chroot "$CHROOT_ROOT" dpkg-divert --local \ --divert /etc/grub.d/30_os-prober.dpkg-divert \ @@ -318,10 +317,6 @@ divert_grub() { undivert_grub() { CHROOT_ROOT="$1" - chroot "$CHROOT_ROOT" rm /usr/sbin/grub-probe - chroot "$CHROOT_ROOT" dpkg-divert --remove --local \ - --rename /usr/sbin/grub-probe - chroot "$CHROOT_ROOT" dpkg-divert --remove --local \ --divert /etc/grub.d/30_os-prober.dpkg-divert \ --rename /etc/grub.d/30_os-prober From 027ea79085289044e954958e5d826036028b2b99 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Mon, 28 May 2018 10:39:53 -0400 Subject: [PATCH 12/54] releasing package livecd-rootfs version 2.528 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 33961537..21115c0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -livecd-rootfs (2.528) UNRELEASED; urgency=medium +livecd-rootfs (2.528) cosmic; urgency=medium * Don't divert grub-probe; otherwise we're missing the filesystem UUIDs that the grub search command needs to find the right prefix/root. This is different than the PARTUUID for booting initrd-less. - -- Mathieu Trudel-Lapierre Mon, 28 May 2018 10:36:18 -0400 + -- Mathieu Trudel-Lapierre Mon, 28 May 2018 10:39:09 -0400 livecd-rootfs (2.527) cosmic; urgency=medium From 7e1bd33544ffd626ff7f3a2abb57a294cf2f489b Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 5 Jun 2018 11:07:06 +1200 Subject: [PATCH 13/54] do not install ubuntu-minimal in ubuntu-base's unminimize --- live-build/auto/build | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/live-build/auto/build b/live-build/auto/build index 01dcc182..03b3d486 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -152,6 +152,11 @@ if [ -f /etc/dpkg/dpkg.cfg.d/excludes ] || [ -f /etc/dpkg/dpkg.cfg.d/excludes.dp echo "/etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp and restore the files manually." fi fi +EOF + + if [ "$PROJECT" != "ubuntu-base" ]; then + # The ubuntu-base unminimizer should not install ubuntu-minimal, but others should. + cat >> chroot/usr/local/sbin/unminimize <<'EOF' if ! dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-minimal 2> /dev/null | grep -q '^installed$'; then echo "Installing ubuntu-minimal package to provide the familiar Ubuntu minimal system..." @@ -163,10 +168,12 @@ if dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-server 2> /dev/ echo "Installing ubuntu-server recommends..." DEBIAN_FRONTEND=noninteractive apt-get install -y landscape-common fi +EOF +fi + cat >> chroot/usr/local/sbin/unminimize <<'EOF' # unminimization succeeded, there is no need to mention it in motd rm -f /etc/update-motd.d/60-unminimize - EOF chmod +x chroot/usr/local/sbin/unminimize From 514faae2db7ac1163deff65b5d3f7d4fcb56e6ea Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 5 Jun 2018 11:08:33 +1200 Subject: [PATCH 14/54] divert /usr/bin/man in minimized images to a script that mentions the unminimize script --- live-build/auto/build | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/live-build/auto/build b/live-build/auto/build index 03b3d486..4a7bc177 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -152,6 +152,10 @@ if [ -f /etc/dpkg/dpkg.cfg.d/excludes ] || [ -f /etc/dpkg/dpkg.cfg.d/excludes.dp echo "/etc/dpkg/dpkg.cfg.d/excludes.dpkg-tmp and restore the files manually." fi fi + +# Remove diverted man binary +rm -f /usr/bin/man +dpkg-divert --quiet --remove --rename /usr/bin/man EOF if [ "$PROJECT" != "ubuntu-base" ]; then @@ -190,7 +194,19 @@ echo "To restore this content, you can run the 'unminimize' command." EOF chmod +x chroot/etc/update-motd.d/60-unminimize - fi + Chroot chroot "dpkg-divert --quiet --add \ + --divert /usr/bin/man.REAL --rename \ + /usr/bin/man" + cat > chroot/usr/bin/man << EOF +#!/bin/sh +echo "This system has been minimized by removing packages and content that are" +echo "not required on a system that users do not log into." +echo "" +echo "To restore this content, including manpages, you can run the 'unminimize'" +echo " command." +EOF + chmod +x chroot/usr/bin/man + fi Chroot chroot "dpkg-divert --quiet --add \ --divert /usr/sbin/update-initramfs.REAL --rename \ /usr/sbin/update-initramfs" From fa1bce5389875383c1647603cbd50aecbe2d1c7b Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 5 Jun 2018 19:58:46 +1200 Subject: [PATCH 15/54] still install a few packages in docker unminimize --- debian/changelog | 6 ++++++ live-build/auto/build | 12 +++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 21115c0f..ccc00916 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.529~ppa1manpages1) cosmic; urgency=medium + + * Test build. + + -- Michael Hudson-Doyle Tue, 05 Jun 2018 14:19:17 +1200 + livecd-rootfs (2.528) cosmic; urgency=medium * Don't divert grub-probe; otherwise we're missing the filesystem UUIDs that diff --git a/live-build/auto/build b/live-build/auto/build index 4a7bc177..0217df43 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -158,8 +158,14 @@ rm -f /usr/bin/man dpkg-divert --quiet --remove --rename /usr/bin/man EOF - if [ "$PROJECT" != "ubuntu-base" ]; then - # The ubuntu-base unminimizer should not install ubuntu-minimal, but others should. + if [ "$PROJECT" = "ubuntu-base" ]; then + # ubuntu-minimal is too much for a docker container (it contains + # e.g. systemd) but we should restore at least a few common things. + cat >> chroot/usr/local/sbin/unminimize <<'EOF' +apt-get install -y less man-db iproute2 vim-tiny +EOF + else + # Other unminimizers install more. cat >> chroot/usr/local/sbin/unminimize <<'EOF' if ! dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-minimal 2> /dev/null | grep -q '^installed$'; then @@ -203,7 +209,7 @@ echo "This system has been minimized by removing packages and content that are" echo "not required on a system that users do not log into." echo "" echo "To restore this content, including manpages, you can run the 'unminimize'" -echo " command." +echo "command." EOF chmod +x chroot/usr/bin/man fi From a2bd86d326e4ae66551a7ff00a073080734868db Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 5 Jun 2018 20:01:13 +1200 Subject: [PATCH 16/54] update changelog --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ccc00916..af0962de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -livecd-rootfs (2.529~ppa1manpages1) cosmic; urgency=medium +livecd-rootfs (2.529~ppa2~manpages1) cosmic; urgency=medium - * Test build. + * Improvements to the ubuntu-base (i.e. Docker) build: + - Customize the unminimize script to not install so many packages. + - Divert /usr/bin/man to a script that points to the unminimize script. -- Michael Hudson-Doyle Tue, 05 Jun 2018 14:19:17 +1200 From 2fc3993d48128db5c0ed3b086007889b846de13b Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 6 Jun 2018 06:44:20 +1200 Subject: [PATCH 17/54] Remove apt lists that are currently removed downstream anyway. (LP: #1699913) --- debian/changelog | 2 ++ live-build/auto/build | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index af0962de..c1ecaabd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ livecd-rootfs (2.529~ppa2~manpages1) cosmic; urgency=medium * Improvements to the ubuntu-base (i.e. Docker) build: - Customize the unminimize script to not install so many packages. - Divert /usr/bin/man to a script that points to the unminimize script. + - Remove apt lists that are currently removed downstream anyway. + (LP: #1699913) -- Michael Hudson-Doyle Tue, 05 Jun 2018 14:19:17 +1200 diff --git a/live-build/auto/build b/live-build/auto/build index 0217df43..eb18d5fe 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -261,6 +261,11 @@ EOF # remove crufty files that shouldn't be left in an image rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old Chroot chroot apt clean + if [ "${PROJECT}:${SUBPROJECT:-}" = "ubuntu-base:minimized" ]; then + # Save even more size by removing apt lists (that are currently removed + # downstream anyway) + rm -f chroot/var/lib/apt/lists/* + fi if [ -f config/oem-config-preinstalled ]; then From ccef323973101a6c18f34f8d00a68195fe216a0c Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 6 Jun 2018 07:12:01 +1200 Subject: [PATCH 18/54] go back to having docker unminimize not install any extra packages update text of man diversion to mention need to install man-db package --- debian/changelog | 4 ++-- live-build/auto/build | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1ecaabd..b23f1957 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -livecd-rootfs (2.529~ppa2~manpages1) cosmic; urgency=medium +livecd-rootfs (2.529~ppa4) cosmic; urgency=medium * Improvements to the ubuntu-base (i.e. Docker) build: - - Customize the unminimize script to not install so many packages. + - Customize the unminimize script to not install ubuntu-minimal. - Divert /usr/bin/man to a script that points to the unminimize script. - Remove apt lists that are currently removed downstream anyway. (LP: #1699913) diff --git a/live-build/auto/build b/live-build/auto/build index eb18d5fe..c9598d34 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -158,14 +158,9 @@ rm -f /usr/bin/man dpkg-divert --quiet --remove --rename /usr/bin/man EOF - if [ "$PROJECT" = "ubuntu-base" ]; then + if [ "$PROJECT" != "ubuntu-base" ]; then # ubuntu-minimal is too much for a docker container (it contains - # e.g. systemd) but we should restore at least a few common things. - cat >> chroot/usr/local/sbin/unminimize <<'EOF' -apt-get install -y less man-db iproute2 vim-tiny -EOF - else - # Other unminimizers install more. + # systemd and other things) cat >> chroot/usr/local/sbin/unminimize <<'EOF' if ! dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-minimal 2> /dev/null | grep -q '^installed$'; then @@ -209,7 +204,7 @@ echo "This system has been minimized by removing packages and content that are" echo "not required on a system that users do not log into." echo "" echo "To restore this content, including manpages, you can run the 'unminimize'" -echo "command." +echo "command. You will still need to ensure the 'man-db' package is installed." EOF chmod +x chroot/usr/bin/man fi From 7c7c2c5b30cb968e1d91eac3bbc4766997563bad Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 6 Jun 2018 07:36:49 +1200 Subject: [PATCH 19/54] rm -r the lists --- live-build/auto/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/build b/live-build/auto/build index c9598d34..6bc025af 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -259,7 +259,7 @@ EOF if [ "${PROJECT}:${SUBPROJECT:-}" = "ubuntu-base:minimized" ]; then # Save even more size by removing apt lists (that are currently removed # downstream anyway) - rm -f chroot/var/lib/apt/lists/* + rm -rf chroot/var/lib/apt/lists/* fi if [ -f config/oem-config-preinstalled ]; then From 664ace2f301f5dccfce6ffb1f462c9dba495a431 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 6 Jun 2018 10:51:35 +1200 Subject: [PATCH 20/54] man un-diverting man idempotent --- debian/changelog | 2 +- live-build/auto/build | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index b23f1957..de1fc9a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.529~ppa4) cosmic; urgency=medium +livecd-rootfs (2.529~ppa6) cosmic; urgency=medium * Improvements to the ubuntu-base (i.e. Docker) build: - Customize the unminimize script to not install ubuntu-minimal. diff --git a/live-build/auto/build b/live-build/auto/build index 6bc025af..374f6b67 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -115,7 +115,7 @@ echo "" echo "Reinstallation of packages may fail due to changes to the system" echo "configuration, the presence of third-party packages, or for other" echo "reasons." -read -p "Would you like to continue? [y/N]" REPLY +read -p "Would you like to continue? [y/N] " REPLY echo # (optional) move to a new line if [ "$REPLY" != "y" ] && [ "$REPLY" != "Y" ] then @@ -153,9 +153,11 @@ if [ -f /etc/dpkg/dpkg.cfg.d/excludes ] || [ -f /etc/dpkg/dpkg.cfg.d/excludes.dp fi fi -# Remove diverted man binary -rm -f /usr/bin/man -dpkg-divert --quiet --remove --rename /usr/bin/man +if [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then + # Remove diverted man binary + rm -f /usr/bin/man + dpkg-divert --quiet --remove --rename /usr/bin/man +fi EOF if [ "$PROJECT" != "ubuntu-base" ]; then From ba96d42d7e0074978b3c255f1263a30e50c0747c Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 7 Jun 2018 05:47:40 +1200 Subject: [PATCH 21/54] fix version number --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index de1fc9a4..54aba798 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.529~ppa6) cosmic; urgency=medium +livecd-rootfs (2.529) cosmic; urgency=medium * Improvements to the ubuntu-base (i.e. Docker) build: - Customize the unminimize script to not install ubuntu-minimal. From 5979538f434e9b0a021e2a81e2cd8b2479bd1603 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 7 Jun 2018 05:49:53 +1200 Subject: [PATCH 22/54] UNRELEASED --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 54aba798..2f5f5cf6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.529) cosmic; urgency=medium +livecd-rootfs (2.529) UNRELEASED; urgency=medium * Improvements to the ubuntu-base (i.e. Docker) build: - Customize the unminimize script to not install ubuntu-minimal. From 02581df4a1bb852fae806aad934b086f5357e673 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 7 Jun 2018 05:59:20 +1200 Subject: [PATCH 23/54] releasing package livecd-rootfs version 2.529 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2f5f5cf6..f7871c15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.529) UNRELEASED; urgency=medium +livecd-rootfs (2.529) cosmic; urgency=medium * Improvements to the ubuntu-base (i.e. Docker) build: - Customize the unminimize script to not install ubuntu-minimal. @@ -6,7 +6,7 @@ livecd-rootfs (2.529) UNRELEASED; urgency=medium - Remove apt lists that are currently removed downstream anyway. (LP: #1699913) - -- Michael Hudson-Doyle Tue, 05 Jun 2018 14:19:17 +1200 + -- Michael Hudson-Doyle Thu, 07 Jun 2018 05:59:12 +1200 livecd-rootfs (2.528) cosmic; urgency=medium From 0e5b19259d8bff41972f9fe678cc22a73905ac4e Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Wed, 6 Jun 2018 11:24:10 -0700 Subject: [PATCH 24/54] ubuntu-cpc: Reintroduce the -root.tar.xz artifact (LP: #1585233). --- debian/changelog | 6 ++++ .../ubuntu-cpc/hooks/031-root-xz.binary | 30 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 live-build/ubuntu-cpc/hooks/031-root-xz.binary diff --git a/debian/changelog b/debian/changelog index f7871c15..422c7128 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.530) UNRELEASED; urgency=medium + + * ubuntu-cpc: Reintroduce the -root.tar.xz artifact (LP: #1585233). + + -- Daniel Watkins Wed, 06 Jun 2018 11:21:57 -0700 + livecd-rootfs (2.529) cosmic; urgency=medium * Improvements to the ubuntu-base (i.e. Docker) build: diff --git a/live-build/ubuntu-cpc/hooks/031-root-xz.binary b/live-build/ubuntu-cpc/hooks/031-root-xz.binary new file mode 100644 index 00000000..4e52369b --- /dev/null +++ b/live-build/ubuntu-cpc/hooks/031-root-xz.binary @@ -0,0 +1,30 @@ +#!/bin/bash -ex +# vi: ts=4 expandtab +# +# Generate the rootfs.tar.xz and manifest + +if [ -n "$SUBARCH" ]; then + echo "Skipping rootfs build for subarch flavor build" + exit 0 +fi + +. /build/config/functions + +tardir=filesystem.dir +mkdir $tardir +cp -a chroot/* $tardir + +setup_mountpoint $tardir + +env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+' +env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get --purge remove --assume-yes '^grub-.*' +env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get autoremove --purge --assume-yes +chroot $tardir mkdir -p /lib/modules + +teardown_mountpoint $tardir + +dpkg-query --admindir=$tardir/var/lib/dpkg -W > livecd.ubuntu-cpc.rootfs.manifest + +(cd "$tardir/" && tar -c *) | xz > "livecd.ubuntu-cpc.rootfs.tar.xz" + +rm -rf $tardir From 8e344b1f6b4773baceeda15f640592cb9e094b5e Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Wed, 6 Jun 2018 14:53:58 -0700 Subject: [PATCH 25/54] Add comment explaining /lib/modules creation --- live-build/ubuntu-cpc/hooks/031-root-xz.binary | 3 +++ 1 file changed, 3 insertions(+) diff --git a/live-build/ubuntu-cpc/hooks/031-root-xz.binary b/live-build/ubuntu-cpc/hooks/031-root-xz.binary index 4e52369b..ab91adb1 100644 --- a/live-build/ubuntu-cpc/hooks/031-root-xz.binary +++ b/live-build/ubuntu-cpc/hooks/031-root-xz.binary @@ -19,6 +19,9 @@ setup_mountpoint $tardir env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+' env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get --purge remove --assume-yes '^grub-.*' env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get autoremove --purge --assume-yes + +# This directory is required downstream by MAAS (LP: #1543204), so ensure it +# exists chroot $tardir mkdir -p /lib/modules teardown_mountpoint $tardir From 136e2e2200d5e8b2c1a67a93c2156ef9ff1eda5f Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Wed, 6 Jun 2018 15:32:06 -0700 Subject: [PATCH 26/54] Drop /lib/modules creation as MAAS handles it downstream --- live-build/ubuntu-cpc/hooks/031-root-xz.binary | 4 ---- 1 file changed, 4 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks/031-root-xz.binary b/live-build/ubuntu-cpc/hooks/031-root-xz.binary index ab91adb1..9d710d73 100644 --- a/live-build/ubuntu-cpc/hooks/031-root-xz.binary +++ b/live-build/ubuntu-cpc/hooks/031-root-xz.binary @@ -20,10 +20,6 @@ env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get --purge remove --assum env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get --purge remove --assume-yes '^grub-.*' env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get autoremove --purge --assume-yes -# This directory is required downstream by MAAS (LP: #1543204), so ensure it -# exists -chroot $tardir mkdir -p /lib/modules - teardown_mountpoint $tardir dpkg-query --admindir=$tardir/var/lib/dpkg -W > livecd.ubuntu-cpc.rootfs.manifest From 92497af14f97f696c7023c7a2b2c54cf32018884 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 6 Jun 2018 15:41:30 -0700 Subject: [PATCH 27/54] live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary: don't manually install grub-efi-amd64 since that forces off grub-pc, which is otherwise now coinstallable. --- debian/changelog | 8 ++++++++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 21115c0f..bd2b261a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.529) UNRELEASED; urgency=medium + + * live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary: don't manually + install grub-efi-amd64 since that forces off grub-pc, which is otherwise + now coinstallable. + + -- Steve Langasek Wed, 06 Jun 2018 15:39:27 -0700 + livecd-rootfs (2.528) cosmic; urgency=medium * Don't divert grub-probe; otherwise we're missing the filesystem UUIDs that diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary index 83cc466d..56328150 100755 --- a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary @@ -88,7 +88,7 @@ install_grub() { efi_target=arm-efi ;; amd64) - chroot mountpoint apt-get install -qqy grub-efi-amd64-signed grub-efi-amd64 shim-signed + chroot mountpoint apt-get install -qqy grub-efi-amd64-signed shim-signed efi_target=x86_64-efi ;; esac From a9bb37c661d3c89232e7440817de0ea34645cecf Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Wed, 6 Jun 2018 16:04:45 -0700 Subject: [PATCH 28/54] Use a relative path for config/functions --- live-build/ubuntu-cpc/hooks/031-root-xz.binary | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/ubuntu-cpc/hooks/031-root-xz.binary b/live-build/ubuntu-cpc/hooks/031-root-xz.binary index 9d710d73..62881cd8 100644 --- a/live-build/ubuntu-cpc/hooks/031-root-xz.binary +++ b/live-build/ubuntu-cpc/hooks/031-root-xz.binary @@ -8,7 +8,7 @@ if [ -n "$SUBARCH" ]; then exit 0 fi -. /build/config/functions +. config/functions tardir=filesystem.dir mkdir $tardir From 80459b6c1b047901582fd5aab1a54eb618fb325c Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Wed, 6 Jun 2018 17:19:17 -0700 Subject: [PATCH 29/54] ubuntu-cpc: Use linux-kvm for all amd64 minimized builds (LP: #1775472). --- debian/changelog | 6 ++++++ live-build/auto/config | 13 +++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 63db68e5..ee759daf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.531) UNRELEASED; urgency=medium + + * ubuntu-cpc: Use linux-kvm for all amd64 minimized builds (LP: #1775472). + + -- Daniel Watkins Wed, 06 Jun 2018 17:17:32 -0700 + livecd-rootfs (2.530) cosmic; urgency=medium * ubuntu-cpc: Reintroduce the -root.tar.xz artifact (LP: #1585233). diff --git a/live-build/auto/config b/live-build/auto/config index 069a69dc..da99afa1 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -600,16 +600,9 @@ case $PROJECT in if [ "${SUBPROJECT:-}" = minimized ]; then add_task install cloud-image add_package install sudo - # linux-kvm currently only exists in xenial, not in - # non-LTS suites. Fall back to virtual flavor, which - # may or may not boot initramfsless but enables us to - # test building and possibly build derivative images - # using other kernel flavors. - # If you enable an extra ppa, it is assumed that - # linux-kvm is available since you control the - # archive and can provide this metapackage as - # necessary. - if [ "$ARCH" = "amd64" ] && ([ -n "$EXTRA_PPAS" ] || [ "$SUITE" = xenial ] || [ "$SUITE" = bionic ]); then + # linux-kvm currently only exists for amd64, so fall back to the + # virtual flavour for other architectures + if [ "$ARCH" = "amd64" ]; then KERNEL_FLAVOURS=kvm else KERNEL_FLAVOURS=virtual From 2e915c1eeea05b27bab376ca919b4fd5b86e9344 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 6 Jun 2018 17:34:19 -0700 Subject: [PATCH 30/54] releasing package livecd-rootfs version 2.531 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08ce7b97..6d216eaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -livecd-rootfs (2.531) UNRELEASED; urgency=medium +livecd-rootfs (2.531) cosmic; urgency=medium + [ Daniel Watkins ] * ubuntu-cpc: Use linux-kvm for all amd64 minimized builds (LP: #1775472). [ Steve Langasek ] @@ -7,7 +8,7 @@ livecd-rootfs (2.531) UNRELEASED; urgency=medium install grub-efi-amd64 since that forces off grub-pc, which is otherwise now coinstallable. - -- Daniel Watkins Wed, 06 Jun 2018 17:17:32 -0700 + -- Steve Langasek Wed, 06 Jun 2018 17:34:07 -0700 livecd-rootfs (2.530) cosmic; urgency=medium From 605b97de97d835a6ffd6271bf0fbae10df93dfbe Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Thu, 7 Jun 2018 14:23:18 -0700 Subject: [PATCH 31/54] ubuntu-cpc: Generate the root image contents once, and use it for both the -root.tar.xz and the .squashfs. --- debian/changelog | 7 +++ .../hooks/031-0-create-root-dir.binary | 25 ++++++++++ .../ubuntu-cpc/hooks/031-1-root-xz.binary | 17 +++++++ .../hooks/031-2-root-squashfs.binary | 29 +++++++++++ .../ubuntu-cpc/hooks/031-root-xz.binary | 29 ----------- .../ubuntu-cpc/hooks/032-root-squashfs.binary | 49 ------------------- 6 files changed, 78 insertions(+), 78 deletions(-) create mode 100755 live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary create mode 100755 live-build/ubuntu-cpc/hooks/031-1-root-xz.binary create mode 100755 live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary delete mode 100644 live-build/ubuntu-cpc/hooks/031-root-xz.binary delete mode 100755 live-build/ubuntu-cpc/hooks/032-root-squashfs.binary diff --git a/debian/changelog b/debian/changelog index 6d216eaf..37b848f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.532) cosmic; urgency=medium + + * ubuntu-cpc: Generate the root image contents once, and use it for both the + -root.tar.xz and the .squashfs. + + -- Daniel Watkins Thu, 07 Jun 2018 11:11:02 -0700 + livecd-rootfs (2.531) cosmic; urgency=medium [ Daniel Watkins ] diff --git a/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary b/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary new file mode 100755 index 00000000..786548cc --- /dev/null +++ b/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary @@ -0,0 +1,25 @@ +#!/bin/bash -ex +# vi: ts=4 expandtab +# +# Generate the root directory/manifest for rootfs.tar.xz and squashfs + +if [ -n "$SUBARCH" ]; then + echo "Skipping rootfs build for subarch flavor build" + exit 0 +fi + +. config/functions + +rootfs_dir=rootfs.dir +mkdir $rootfs_dir +cp -a chroot/* $rootfs_dir + +setup_mountpoint $rootfs_dir + +env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+' +env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get --purge remove --assume-yes '^grub-.*' +env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get autoremove --purge --assume-yes + +teardown_mountpoint $rootfs_dir + +dpkg-query --admindir=$rootfs_dir/var/lib/dpkg -W > $rootfs_dir.manifest diff --git a/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary b/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary new file mode 100755 index 00000000..8752f048 --- /dev/null +++ b/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary @@ -0,0 +1,17 @@ +#!/bin/bash -ex +# vi: ts=4 expandtab +# +# Generate the rootfs.tar.xz and manifest + +if [ -n "$SUBARCH" ]; then + echo "Skipping rootfs build for subarch flavor build" + exit 0 +fi + +. config/functions + +# This is the directory created by 031-0-create-root-dir.binary +rootfs_dir=rootfs.dir + +cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest +(cd "$rootfs_dir/" && tar -c *) | xz > "livecd.ubuntu-cpc.rootfs.tar.xz" diff --git a/live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary b/live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary new file mode 100755 index 00000000..5d2b0901 --- /dev/null +++ b/live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary @@ -0,0 +1,29 @@ +#!/bin/bash -ex +# vi: ts=4 noexpandtab +# +# Generate a squashfs root and manifest + +case $IMAGE_TARGETS in + ""|*squashfs*) + ;; + *) + echo "Skipping squashfs build" + exit 0 + ;; +esac + +if [ -n "$SUBARCH" ]; then + echo "Skipping rootfs build for subarch flavor build" + exit 0 +fi + +# This is the directory created by 031-0-create-root-dir.binary +rootfs_dir=rootfs.dir + +squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs" + +cp $rootfs_dir.manifest "${squashfs_f}.manifest" + +(cd "$rootfs_dir" && + mksquashfs . ${squashfs_f} \ + -no-progress -xattrs -comp xz ) diff --git a/live-build/ubuntu-cpc/hooks/031-root-xz.binary b/live-build/ubuntu-cpc/hooks/031-root-xz.binary deleted file mode 100644 index 62881cd8..00000000 --- a/live-build/ubuntu-cpc/hooks/031-root-xz.binary +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -ex -# vi: ts=4 expandtab -# -# Generate the rootfs.tar.xz and manifest - -if [ -n "$SUBARCH" ]; then - echo "Skipping rootfs build for subarch flavor build" - exit 0 -fi - -. config/functions - -tardir=filesystem.dir -mkdir $tardir -cp -a chroot/* $tardir - -setup_mountpoint $tardir - -env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+' -env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get --purge remove --assume-yes '^grub-.*' -env DEBIAN_FRONTEND=noninteractive chroot $tardir apt-get autoremove --purge --assume-yes - -teardown_mountpoint $tardir - -dpkg-query --admindir=$tardir/var/lib/dpkg -W > livecd.ubuntu-cpc.rootfs.manifest - -(cd "$tardir/" && tar -c *) | xz > "livecd.ubuntu-cpc.rootfs.tar.xz" - -rm -rf $tardir diff --git a/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary b/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary deleted file mode 100755 index ec6c1b05..00000000 --- a/live-build/ubuntu-cpc/hooks/032-root-squashfs.binary +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -ex -# vi: ts=4 noexpandtab -# -# Generate a squashfs root and manifest - -case $IMAGE_TARGETS in - ""|*squashfs*) - ;; - *) - echo "Skipping squashfs build" - exit 0 - ;; -esac - -if [ -n "$SUBARCH" ]; then - echo "Skipping rootfs build for subarch flavor build" - exit 0 -fi - -. config/functions - -mkdir binary/boot/squashfs.dir -cp -a chroot/* binary/boot/squashfs.dir - -setup_mountpoint binary/boot/squashfs.dir - -chroot binary/boot/squashfs.dir dpkg-divert --local --rename /usr/sbin/grub-probe -chroot binary/boot/squashfs.dir touch /usr/sbin/grub-probe -chroot binary/boot/squashfs.dir chmod +x /usr/sbin/grub-probe - -env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+' -env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get --purge remove --assume-yes '^grub-.*' -env DEBIAN_FRONTEND=noninteractive chroot binary/boot/squashfs.dir apt-get autoremove --purge --assume-yes -rm -rf binary/boot/squashfs.dir/boot/grub -chroot binary/boot/squashfs.dir mkdir -p /lib/modules - -chroot binary/boot/squashfs.dir rm /usr/sbin/grub-probe -chroot binary/boot/squashfs.dir dpkg-divert --remove --local --rename /usr/sbin/grub-probe - -teardown_mountpoint binary/boot/squashfs.dir - -squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs" -squashfs_f_manifest="${squashfs_f}.manifest" - -dpkg-query --admindir=binary/boot/squashfs.dir/var/lib/dpkg -W > ${squashfs_f_manifest} - -(cd "binary/boot/squashfs.dir/" && - mksquashfs . ${squashfs_f} \ - -no-progress -xattrs -comp xz ) From ab85167fb51443dba269a78b1bcd835a14b17c96 Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Thu, 7 Jun 2018 16:24:29 -0700 Subject: [PATCH 32/54] Shell formatting cleanup --- live-build/ubuntu-cpc/hooks/031-1-root-xz.binary | 4 +--- live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary b/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary index 8752f048..fab8a834 100755 --- a/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary +++ b/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary @@ -8,10 +8,8 @@ if [ -n "$SUBARCH" ]; then exit 0 fi -. config/functions - # This is the directory created by 031-0-create-root-dir.binary rootfs_dir=rootfs.dir cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest -(cd "$rootfs_dir/" && tar -c *) | xz > "livecd.ubuntu-cpc.rootfs.tar.xz" +(cd $rootfs_dir/ && tar -c *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz diff --git a/live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary b/live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary index 5d2b0901..f4c2ac3d 100755 --- a/live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary +++ b/live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary @@ -20,10 +20,10 @@ fi # This is the directory created by 031-0-create-root-dir.binary rootfs_dir=rootfs.dir -squashfs_f="${PWD}/livecd.ubuntu-cpc.squashfs" +squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs" -cp $rootfs_dir.manifest "${squashfs_f}.manifest" +cp $rootfs_dir.manifest $squashfs_f.manifest -(cd "$rootfs_dir" && - mksquashfs . ${squashfs_f} \ +(cd $rootfs_dir && + mksquashfs . $squashfs_f \ -no-progress -xattrs -comp xz ) From f9cae3ff7fd6a77147f4faa68e474e9b35c0cbb6 Mon Sep 17 00:00:00 2001 From: Daniel Watkins Date: Thu, 7 Jun 2018 16:24:59 -0700 Subject: [PATCH 33/54] Restore removal of /boot/grub from rootfs artifacts --- live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary | 1 + 1 file changed, 1 insertion(+) diff --git a/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary b/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary index 786548cc..9a916658 100755 --- a/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary +++ b/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary @@ -19,6 +19,7 @@ setup_mountpoint $rootfs_dir env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get --purge remove --assume-yes '^linux-.*' 'linux-base+' env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get --purge remove --assume-yes '^grub-.*' env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get autoremove --purge --assume-yes +rm -rf $rootfs_dir/boot/grub teardown_mountpoint $rootfs_dir From 58b510cf99e4282bda91ca48f53f2ac0c021bb33 Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Fri, 8 Jun 2018 10:14:16 -0700 Subject: [PATCH 34/54] ubuntu-cpc: Remove git-man for minimized images --- debian/changelog | 6 ++++++ live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 37b848f4..1b27c27b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,12 @@ livecd-rootfs (2.532) cosmic; urgency=medium -- Daniel Watkins Thu, 07 Jun 2018 11:11:02 -0700 +livecd-rootfs (2.531ubuntu1) cosmic; urgency=medium + + * ubuntu-cpc: Remove git-man for minimized images + + -- Robert C Jennings Fri, 08 Jun 2018 10:10:53 -0700 + livecd-rootfs (2.531) cosmic; urgency=medium [ Daniel Watkins ] diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot index ef03273d..b28127ec 100755 --- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot @@ -149,7 +149,7 @@ if [ "${SUBPROJECT:-}" = minimized ]; then # FIXME: iso-codes is a dep of software-properties and shouldn't be _xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \ apt-get -y autoremove --purge iso-codes xauth pastebinit \ - plymouth open-vm-tools git shared-mime-info vim vim-common \ + plymouth open-vm-tools git git-man shared-mime-info vim vim-common \ console-setup ncurses-term tmux screen policykit-1 \ xdg-user-dirs less publicsuffix run-one apport-symptoms \ ubuntu-cloudimage-keyring file From 6caddc0a8c20137fef84fe6e83f6ce87c54eac13 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 11 Jun 2018 15:01:15 -0700 Subject: [PATCH 35/54] changelog fix-up --- debian/changelog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1b27c27b..23d888a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.533) UNRELEASED; urgency=medium + + * ubuntu-cpc: Remove git-man for minimized images + + -- Robert C Jennings Fri, 08 Jun 2018 10:10:53 -0700 + livecd-rootfs (2.532) cosmic; urgency=medium * ubuntu-cpc: Generate the root image contents once, and use it for both the @@ -5,12 +11,6 @@ livecd-rootfs (2.532) cosmic; urgency=medium -- Daniel Watkins Thu, 07 Jun 2018 11:11:02 -0700 -livecd-rootfs (2.531ubuntu1) cosmic; urgency=medium - - * ubuntu-cpc: Remove git-man for minimized images - - -- Robert C Jennings Fri, 08 Jun 2018 10:10:53 -0700 - livecd-rootfs (2.531) cosmic; urgency=medium [ Daniel Watkins ] From 8b1970f661648e03ebd274c43c0f7976cfcf3fe9 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 14 Jun 2018 12:41:46 +0100 Subject: [PATCH 36/54] live-build/auto/config: Drop "lp-*" hostname filter for Launchpad builders, since LP #1747015 is now fixed; "*.buildd" should be enough. --- debian/changelog | 5 +++++ live-build/auto/config | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 23d888a5..9e4ff90b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ livecd-rootfs (2.533) UNRELEASED; urgency=medium + [ Robert C Jennings ] * ubuntu-cpc: Remove git-man for minimized images + [ Colin Watson ] + * live-build/auto/config: Drop "lp-*" hostname filter for Launchpad + builders, since LP #1747015 is now fixed; "*.buildd" should be enough. + -- Robert C Jennings Fri, 08 Jun 2018 10:10:53 -0700 livecd-rootfs (2.532) cosmic; urgency=medium diff --git a/live-build/auto/config b/live-build/auto/config index da99afa1..bd25e49f 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -17,7 +17,7 @@ if [ -z "$MIRROR" ]; then *.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; - *.buildd|lp-*) MIRROR=http://ftpmaster.internal/ubuntu/ + *.buildd) MIRROR=http://ftpmaster.internal/ubuntu/ SEEDMIRROR=http://archive-team.internal/seeds/ ;; *.ppa|*.scalingstack) MIRROR=http://ftpmaster.internal/ubuntu/ From c9aaddd56a47ff683746f62732ed5ea6d1945dc5 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 15 Jun 2018 14:36:24 +1200 Subject: [PATCH 37/54] Disable journald rate limiting in the live-server live session. (LP: #1776891) --- debian/changelog | 5 +++++ .../overlay/etc/systemd/journald.conf.d/no-rate-limit.conf | 1 + 2 files changed, 6 insertions(+) create mode 100644 live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf diff --git a/debian/changelog b/debian/changelog index 23d888a5..3f2c804c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ livecd-rootfs (2.533) UNRELEASED; urgency=medium + [ Robert C Jennings ] * ubuntu-cpc: Remove git-man for minimized images + [ Michael Hudson-Doyle ] + * Disable journald rate limiting in the live-server live session. + (LP: #1776891) + -- Robert C Jennings Fri, 08 Jun 2018 10:10:53 -0700 livecd-rootfs (2.532) cosmic; urgency=medium 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 new file mode 100644 index 00000000..1d8af89a --- /dev/null +++ b/live-build/ubuntu-server/includes.binary/overlay/etc/systemd/journald.conf.d/no-rate-limit.conf @@ -0,0 +1 @@ +RateLimitIntervalSec=0 From b7403fabf1b81c8c0b7d7d13d1b403232b5caab1 Mon Sep 17 00:00:00 2001 From: Phil Roche Date: Wed, 4 Jul 2018 16:48:23 +0100 Subject: [PATCH 38/54] Update unminimize script text and install ubuntu-standard when unminimizing a minimal image (LP: #1778777) --- debian/changelog | 8 ++++++++ live-build/auto/build | 10 +++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9e4ff90b..b5ee7215 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.534) bionic; urgency=medium + + [ Francis Ginther ] + * Update unminimize script text and install ubuntu-standard when + unminimizing a minimal image (LP: #1778777) + +-- Phil Roche Wed, 04 Jul 2018 15:44:15 +0100 + livecd-rootfs (2.533) UNRELEASED; urgency=medium [ Robert C Jennings ] diff --git a/live-build/auto/build b/live-build/auto/build index 374f6b67..519ce1e7 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -109,12 +109,16 @@ set -e echo "This system has been minimized by removing packages and content that are" echo "not required on a system that users do not log into." echo "" -echo "This script restores the content and packages that are found on a default" -echo "Ubuntu server system." +echo "This script restores content and packages that are found on a default" +echo "Ubuntu server system in order to make this system more suitable for" +echo "interactive use." echo "" echo "Reinstallation of packages may fail due to changes to the system" echo "configuration, the presence of third-party packages, or for other" echo "reasons." +echo "" +echo "This operation may take some time." +echo "" read -p "Would you like to continue? [y/N] " REPLY echo # (optional) move to a new line if [ "$REPLY" != "y" ] && [ "$REPLY" != "Y" ] @@ -167,7 +171,7 @@ EOF if ! dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-minimal 2> /dev/null | grep -q '^installed$'; then echo "Installing ubuntu-minimal package to provide the familiar Ubuntu minimal system..." - DEBIAN_FRONTEND=noninteractive apt-get install -y ubuntu-minimal + DEBIAN_FRONTEND=noninteractive apt-get install -y ubuntu-minimal ubuntu-standard fi if dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-server 2> /dev/null | grep -q '^installed$' \ From 89c54953d5eba0becab45371201587ae0c87663f Mon Sep 17 00:00:00 2001 From: Phil Roche Date: Wed, 4 Jul 2018 17:13:02 +0100 Subject: [PATCH 39/54] Update changelog to add unminimize change to current UNRELEASED changelog entry --- debian/changelog | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index b5ee7215..3975252a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,3 @@ -livecd-rootfs (2.534) bionic; urgency=medium - - [ Francis Ginther ] - * Update unminimize script text and install ubuntu-standard when - unminimizing a minimal image (LP: #1778777) - --- Phil Roche Wed, 04 Jul 2018 15:44:15 +0100 - livecd-rootfs (2.533) UNRELEASED; urgency=medium [ Robert C Jennings ] @@ -15,6 +7,10 @@ livecd-rootfs (2.533) UNRELEASED; urgency=medium * live-build/auto/config: Drop "lp-*" hostname filter for Launchpad builders, since LP #1747015 is now fixed; "*.buildd" should be enough. + [ Francis Ginther ] + * Update unminimize script text and install ubuntu-standard when + unminimizing a minimal image (LP: #1778777) + -- Robert C Jennings Fri, 08 Jun 2018 10:10:53 -0700 livecd-rootfs (2.532) cosmic; urgency=medium From c3f5ee6716dcdbede2753e308002bbf016890861 Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Wed, 11 Jul 2018 15:06:16 -0500 Subject: [PATCH 40/54] Disable checksum generation These checksums are unused, integrity checking in launchpad is performed separately. --- debian/changelog | 1 + live-build/auto/config | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3975252a..bcdc9989 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ livecd-rootfs (2.533) UNRELEASED; urgency=medium [ Robert C Jennings ] * ubuntu-cpc: Remove git-man for minimized images + * Disable checksum generation [ Colin Watson ] * live-build/auto/config: Drop "lp-*" hostname filter for Launchpad diff --git a/live-build/auto/config b/live-build/auto/config index bd25e49f..821977df 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -795,6 +795,7 @@ lb config noauto \ --initsystem none \ --bootloader "$BOOTLOADER" \ ${INITRAMFS_COMPRESSION:+--initramfs-compression "$INITRAMFS_COMPRESSION"} \ + --checksums none \ --cache false \ ${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \ $OPTS \ From dee54ed412d3084a66aa24f0db39b27d0f16cdd7 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Wed, 18 Jul 2018 11:07:30 -0600 Subject: [PATCH 41/54] Releasing 2.533 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index bcdc9989..edc5317a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.533) UNRELEASED; urgency=medium +livecd-rootfs (2.533) cosmic; urgency=medium [ Robert C Jennings ] * ubuntu-cpc: Remove git-man for minimized images @@ -12,7 +12,7 @@ livecd-rootfs (2.533) UNRELEASED; urgency=medium * Update unminimize script text and install ubuntu-standard when unminimizing a minimal image (LP: #1778777) - -- Robert C Jennings Fri, 08 Jun 2018 10:10:53 -0700 + -- Adam Conrad Wed, 18 Jul 2018 11:06:54 -0600 livecd-rootfs (2.532) cosmic; urgency=medium From 3db2340c545b30788becc596b674b26ec4b03669 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 1 Aug 2018 18:02:13 -0700 Subject: [PATCH 42/54] generate all tar files with --xattrs. LP: #1302192. --- debian/changelog | 6 ++++++ live-build/auto/build | 4 ++-- live-build/ubuntu-cpc/hooks/031-1-root-xz.binary | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index edc5317a..9c3e0dfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.534) UNRELEASED; urgency=medium + + * generate all tar files with --xattrs. LP: #1302192. + + -- Steve Langasek Wed, 01 Aug 2018 17:59:41 -0700 + livecd-rootfs (2.533) cosmic; urgency=medium [ Robert C Jennings ] diff --git a/live-build/auto/build b/live-build/auto/build index 519ce1e7..c71b7b10 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -490,7 +490,7 @@ for ISO in binary.iso binary.hybrid.iso; do done if [ -e "binary/$INITFS/filesystem.dir" ]; then - (cd "binary/$INITFS/filesystem.dir/" && tar -c *) | \ + (cd "binary/$INITFS/filesystem.dir/" && tar -c --xattrs *) | \ gzip -9 --rsyncable > "$PREFIX.rootfs.tar.gz" chmod 644 "$PREFIX.rootfs.tar.gz" elif [ -e binary-tar.tar.gz ]; then @@ -527,7 +527,7 @@ EOF fi if [ "$PROJECT" = "ubuntu-touch" ] || [ "$PROJECT" = "ubuntu-touch-custom" ]; then - (cd "binary/$INITFS/custom.dir/" && tar -c *) | \ + (cd "binary/$INITFS/custom.dir/" && tar -c --xattrs *) | \ gzip -9 --rsyncable > "$PREFIX.custom.tar.gz" chmod 644 "$PREFIX.custom.tar.gz" fi diff --git a/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary b/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary index fab8a834..5695f96d 100755 --- a/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary +++ b/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary @@ -12,4 +12,4 @@ fi rootfs_dir=rootfs.dir cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest -(cd $rootfs_dir/ && tar -c *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz +(cd $rootfs_dir/ && tar -c --xattrs *) | xz > livecd.ubuntu-cpc.rootfs.tar.xz From 67142507ae0034c5f3d230fb316bebd9742b7107 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 6 Aug 2018 13:12:05 -0700 Subject: [PATCH 43/54] releasing package livecd-rootfs version 2.534 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3c7a8388..6a426743 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.534) UNRELEASED; urgency=medium +livecd-rootfs (2.534) cosmic; urgency=medium [ Michael Hudson-Doyle ] * Disable journald rate limiting in the live-server live session. @@ -7,7 +7,7 @@ livecd-rootfs (2.534) UNRELEASED; urgency=medium [ Steve Langasek ] * generate all tar files with --xattrs. LP: #1302192. - -- Steve Langasek Wed, 01 Aug 2018 23:28:47 -0700 + -- Steve Langasek Mon, 06 Aug 2018 13:12:02 -0700 livecd-rootfs (2.533) cosmic; urgency=medium From 00151c5e0bcccfa225281ff181a50ef594b8411f Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Thu, 16 Aug 2018 21:28:52 +1200 Subject: [PATCH 44/54] Set PREINSTALLED=true for live-server so that universe ends up being enabled in the image. --- debian/changelog | 7 +++++++ live-build/auto/config | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6a426743..aa7c804b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.535~ppa1) cosmic; urgency=medium + + * Set PREINSTALLED=true for live-server so that universe ends up being + enabled in the image. + + -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 + livecd-rootfs (2.534) cosmic; urgency=medium [ Michael Hudson-Doyle ] diff --git a/live-build/auto/config b/live-build/auto/config index 821977df..5ea1f6fe 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -151,6 +151,7 @@ case $IMAGEFORMAT in # by skipping lb_chroot_live-packages. skip_lb_stage chroot_live-packages INITRAMFS_TYPE=auto + PREINSTALLED=true ;; *) PREINSTALLED=true From 1aa8b9d882b44e1237b556f552f7c979740a5f95 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 10:09:57 +1200 Subject: [PATCH 45/54] ffs --- debian/changelog | 4 ++-- live-build/auto/config | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index aa7c804b..83ba3237 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -livecd-rootfs (2.535~ppa1) cosmic; urgency=medium +livecd-rootfs (2.535~ppa2) cosmic; urgency=medium * Set PREINSTALLED=true for live-server so that universe ends up being - enabled in the image. + enabled in the image. But make sure PREINSTALLED_POOL_SEEDS is not set. -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 diff --git a/live-build/auto/config b/live-build/auto/config index 5ea1f6fe..c4b67e5b 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -495,9 +495,11 @@ case $PROJECT in amd64) add_package live linux-signed-generic ;; esac ;; + *) + PREINSTALL_POOL_SEEDS='server-ship' + ;; esac COMPONENTS='main' - PREINSTALL_POOL_SEEDS='server-ship' ;; ubuntu-core) @@ -695,6 +697,10 @@ export APT_OPTIONS if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then add_task live "$LIVE_TASK" fi +if [ -n "$LIVE_TASK" ] && [ "$PROJECT:${SUBPROJECT:-}" = "ubuntu-server:live" ]; then + add_task live "$LIVE_TASK" +fi + case $PROJECT in ubuntu-dvd) From e80459b96755b984b22acc8726cd7292ac732c4e Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 11:09:37 +1200 Subject: [PATCH 46/54] grumble --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 83ba3237..dc3a9177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ -livecd-rootfs (2.535~ppa2) cosmic; urgency=medium +livecd-rootfs (2.535~ppa3) cosmic; urgency=medium * Set PREINSTALLED=true for live-server so that universe ends up being enabled in the image. But make sure PREINSTALLED_POOL_SEEDS is not set. + And that the LIVE_TASK gets installed. -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 From a2614719699eb2d72f6ba77f1d25dd5982574be5 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 12:00:41 +1200 Subject: [PATCH 47/54] a less hackish approach --- live-build/auto/build | 2 +- live-build/auto/config | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index c71b7b10..50831ba2 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -268,7 +268,7 @@ EOF rm -rf chroot/var/lib/apt/lists/* fi - 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 c4b67e5b..070d73f3 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -151,7 +151,7 @@ case $IMAGEFORMAT in # by skipping lb_chroot_live-packages. skip_lb_stage chroot_live-packages INITRAMFS_TYPE=auto - PREINSTALLED=true + touch config/universe-enabled ;; *) PREINSTALLED=true @@ -214,9 +214,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 @@ -495,10 +495,8 @@ case $PROJECT in amd64) add_package live linux-signed-generic ;; esac ;; - *) - PREINSTALL_POOL_SEEDS='server-ship' - ;; esac + PREINSTALL_POOL_SEEDS='server-ship' COMPONENTS='main' ;; @@ -697,10 +695,6 @@ export APT_OPTIONS if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then add_task live "$LIVE_TASK" fi -if [ -n "$LIVE_TASK" ] && [ "$PROJECT:${SUBPROJECT:-}" = "ubuntu-server:live" ]; then - add_task live "$LIVE_TASK" -fi - case $PROJECT in ubuntu-dvd) From e804cc4e00d53a4d20a822911da11e07fb76a488 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 12:01:27 +1200 Subject: [PATCH 48/54] a less hackish approach --- live-build/auto/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 070d73f3..4d492d31 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -496,8 +496,8 @@ case $PROJECT in esac ;; esac - PREINSTALL_POOL_SEEDS='server-ship' COMPONENTS='main' + PREINSTALL_POOL_SEEDS='server-ship' ;; ubuntu-core) From 59b8eb76e2d35d004aa6aa47cdc717acb298a043 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 12:04:12 +1200 Subject: [PATCH 49/54] Disentangle enabling universe in the final image a little from having PREINSTALLED=true set and enable it for a live-server build. --- debian/changelog | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index dc3a9177..4a95350d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,9 @@ -livecd-rootfs (2.535~ppa3) cosmic; urgency=medium +livecd-rootfs (2.535~ppa4) cosmic; urgency=medium - * Set PREINSTALLED=true for live-server so that universe ends up being - enabled in the image. But make sure PREINSTALLED_POOL_SEEDS is not set. - And that the LIVE_TASK gets installed. + * Disentangle enabling universe in the final image a little from having + PREINSTALLED=true set and enable it for a live-server build. - -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 + -- Michael Hudson-Doyle Thu, 16 Aug 2018 21:28:00 +1200 livecd-rootfs (2.534) cosmic; urgency=medium From 15505866a8ad903b3baa1e0e68f1ee4f824540ec Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 13:51:55 +1200 Subject: [PATCH 50/54] add bug ref to changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 4a95350d..1eca5b5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ livecd-rootfs (2.535~ppa4) cosmic; 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 Thu, 16 Aug 2018 21:28:00 +1200 From 061ea269840dd52dc4fdc0c8603283df91f95dad Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 17 Aug 2018 16:14:41 +1200 Subject: [PATCH 51/54] fix changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1eca5b5c..229d6d5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (2.535~ppa4) cosmic; urgency=medium +livecd-rootfs (2.535) 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. From 2c76f50499ec0f1336f89ffd793a14da26e382b5 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 24 Aug 2018 13:04:56 +1200 Subject: [PATCH 52/54] releasing package livecd-rootfs version 2.535 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 229d6d5b..0442d2b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -livecd-rootfs (2.535) UNRELEASED; urgency=medium +livecd-rootfs (2.535) cosmic; 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 Thu, 16 Aug 2018 21:28:00 +1200 + -- Michael Hudson-Doyle Fri, 24 Aug 2018 13:04:51 +1200 livecd-rootfs (2.534) cosmic; urgency=medium From ae4a760edb605fbab9443abed9159461f8eaa8f3 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 28 Aug 2018 10:55:19 +1200 Subject: [PATCH 53/54] Fix live-server journald config snippet to actually disable journald rate limiting. --- debian/changelog | 7 +++++++ .../overlay/etc/systemd/journald.conf.d/no-rate-limit.conf | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0442d2b6..66cd1415 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.536) UNRELEASED; urgency=medium + + * Fix live-server journald config snippet to actually disable journald rate + limiting. + + -- Michael Hudson-Doyle Tue, 28 Aug 2018 10:54:38 +1200 + livecd-rootfs (2.535) cosmic; urgency=medium * Disentangle enabling universe in the final image a little from having 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 From f04caf6104e7d6db7a8ad83049a0e595f5a3ff57 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 28 Aug 2018 11:00:43 +1200 Subject: [PATCH 54/54] releasing package livecd-rootfs version 2.536 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 66cd1415..e773ad65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -livecd-rootfs (2.536) UNRELEASED; urgency=medium +livecd-rootfs (2.536) cosmic; urgency=medium * Fix live-server journald config snippet to actually disable journald rate limiting. - -- Michael Hudson-Doyle Tue, 28 Aug 2018 10:54:38 +1200 + -- Michael Hudson-Doyle Tue, 28 Aug 2018 11:00:39 +1200 livecd-rootfs (2.535) cosmic; urgency=medium