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

Import patches-unapplied version 2.522 to ubuntu/bionic-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: abfea5773a658c1da3390b6155bc9d8486e66a10

New changelog entries:
  * Remove landscape-common from minimal image, and handle restoring it in
    unminimize script.  LP: #1763182.
This commit is contained in:
Steve Langasek 2018-04-17 13:53:00 -07:00 committed by usd-importer
parent abfea5773a
commit 5b1c308682
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.522) bionic; urgency=medium
* Remove landscape-common from minimal image, and handle restoring it in
unminimize script. LP: #1763182.
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 17 Apr 2018 13:53:00 -0700
livecd-rootfs (2.521) bionic; urgency=medium livecd-rootfs (2.521) bionic; urgency=medium
* In subiquity image, mount additional squashfs in /media. * In subiquity image, mount additional squashfs in /media.

11
live-build/auto/build
View File

@ -158,6 +158,12 @@ if ! dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-minimal 2> /d
DEBIAN_FRONTEND=noninteractive apt-get install -y ubuntu-minimal DEBIAN_FRONTEND=noninteractive apt-get install -y ubuntu-minimal
fi fi
if dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-server 2> /dev/null | grep -q '^installed$' \
&& ! dpkg-query --show --showformat='${db:Status-Status}\n' landscape-common 2> /dev/null | grep -q '^installed$'; then
echo "Installing ubuntu-server recommends..."
DEBIAN_FRONTEND=noninteractive apt-get install -y landscape-common
fi
# unminimization succeeded, there is no need to mention it in motd # unminimization succeeded, there is no need to mention it in motd
rm -f /etc/update-motd.d/60-unminimize rm -f /etc/update-motd.d/60-unminimize
@ -203,9 +209,12 @@ EOF
# force removal of initramfs-tools, which we assert is not # force removal of initramfs-tools, which we assert is not
# required for any minimized images but is still pulled in by # required for any minimized images but is still pulled in by
# default # default
# also remove landscape-common, which is heavyweight and
# in the server seed only to provide /etc/motd content which
# would only be seen by humans
Chroot chroot "env DEBIAN_FRONTEND=noninteractive \ Chroot chroot "env DEBIAN_FRONTEND=noninteractive \
apt-get -y purge initramfs-tools busybox-initramfs \ apt-get -y purge initramfs-tools busybox-initramfs \
busybox-static" busybox-static landscape-common"
# and if initramfs-tools was configured before our kernel, # and if initramfs-tools was configured before our kernel,
# /etc/kernel/postinst.d/initramfs-tools will have created # /etc/kernel/postinst.d/initramfs-tools will have created
# an initramfs despite the generic dpkg-divert; so remove it # an initramfs despite the generic dpkg-divert; so remove it