diff --git a/debian/changelog b/debian/changelog index 37b848f4..edc5317a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +livecd-rootfs (2.533) cosmic; 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 + 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) + + -- Adam Conrad Wed, 18 Jul 2018 11:06:54 -0600 + livecd-rootfs (2.532) cosmic; urgency=medium * ubuntu-cpc: Generate the root image contents once, and use it for both the 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$' \ diff --git a/live-build/auto/config b/live-build/auto/config index da99afa1..821977df 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/ @@ -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 \ 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