From 6e9dca6c823b5897eae4935cb696e62decf610c3 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Mon, 13 May 2019 12:45:10 +0000 Subject: [PATCH] Imported 2.582 Updating from upstream following busybox-static removal (philroche) --- debian/changelog | 6 ++++++ live-build/auto/build | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6044f166..720a7eed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.582) eoan; urgency=medium + + * Don't purge busybox-static in minimized, no longer installed + + -- Julian Andres Klode Mon, 13 May 2019 14:22:56 +0200 + livecd-rootfs (2.581) eoan; urgency=medium * Remove device nodes later for ubuntu-base:minimized (i.e. docker) builds. diff --git a/live-build/auto/build b/live-build/auto/build index b07caad7..c036cbf0 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -293,7 +293,7 @@ EOF # would only be seen by humans Chroot chroot "env DEBIAN_FRONTEND=noninteractive \ apt-get -y purge initramfs-tools busybox-initramfs \ - busybox-static landscape-common" + landscape-common" # and if initramfs-tools was configured before our kernel, # /etc/kernel/postinst.d/initramfs-tools will have created # an initramfs despite the generic dpkg-divert; so remove it