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

Import patches-unapplied version 2.533 to ubuntu/cosmic-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 3f03257a8cb92f1fc1afaa292f5de667f3685633

New changelog entries:
  [ 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)
This commit is contained in:
Adam Conrad 2018-07-18 11:06:54 -06:00 committed by usd-importer
parent 3f03257a8c
commit 0564e36edc
4 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
debian/changelog vendored
View File

@ -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 <adconrad@ubuntu.com> Wed, 18 Jul 2018 11:06:54 -0600
livecd-rootfs (2.532) cosmic; urgency=medium livecd-rootfs (2.532) cosmic; urgency=medium
* ubuntu-cpc: Generate the root image contents once, and use it for both the * ubuntu-cpc: Generate the root image contents once, and use it for both the

10
live-build/auto/build
View File

@ -109,12 +109,16 @@ set -e
echo "This system has been minimized by removing packages and content that are" 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 "not required on a system that users do not log into."
echo "" echo ""
echo "This script restores the content and packages that are found on a default" echo "This script restores content and packages that are found on a default"
echo "Ubuntu server system." echo "Ubuntu server system in order to make this system more suitable for"
echo "interactive use."
echo "" echo ""
echo "Reinstallation of packages may fail due to changes to the system" echo "Reinstallation of packages may fail due to changes to the system"
echo "configuration, the presence of third-party packages, or for other" echo "configuration, the presence of third-party packages, or for other"
echo "reasons." echo "reasons."
echo ""
echo "This operation may take some time."
echo ""
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 echo # (optional) move to a new line
if [ "$REPLY" != "y" ] && [ "$REPLY" != "Y" ] 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 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..." 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 fi
if dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-server 2> /dev/null | grep -q '^installed$' \ if dpkg-query --show --showformat='${db:Status-Status}\n' ubuntu-server 2> /dev/null | grep -q '^installed$' \

3
live-build/auto/config
View File

@ -17,7 +17,7 @@ if [ -z "$MIRROR" ]; then
*.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/ *.ubuntu.com) MIRROR=http://ftpmaster.internal/ubuntu/
SEEDMIRROR=http://archive-team.internal/seeds/ 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/ SEEDMIRROR=http://archive-team.internal/seeds/
;; ;;
*.ppa|*.scalingstack) MIRROR=http://ftpmaster.internal/ubuntu/ *.ppa|*.scalingstack) MIRROR=http://ftpmaster.internal/ubuntu/
@ -795,6 +795,7 @@ lb config noauto \
--initsystem none \ --initsystem none \
--bootloader "$BOOTLOADER" \ --bootloader "$BOOTLOADER" \
${INITRAMFS_COMPRESSION:+--initramfs-compression "$INITRAMFS_COMPRESSION"} \ ${INITRAMFS_COMPRESSION:+--initramfs-compression "$INITRAMFS_COMPRESSION"} \
--checksums none \
--cache false \ --cache false \
${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \ ${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \
$OPTS \ $OPTS \

2
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
View File

@ -149,7 +149,7 @@ if [ "${SUBPROJECT:-}" = minimized ]; then
# FIXME: iso-codes is a dep of software-properties and shouldn't be # FIXME: iso-codes is a dep of software-properties and shouldn't be
_xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \ _xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \
apt-get -y autoremove --purge iso-codes xauth pastebinit \ 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 \ console-setup ncurses-term tmux screen policykit-1 \
xdg-user-dirs less publicsuffix run-one apport-symptoms \ xdg-user-dirs less publicsuffix run-one apport-symptoms \
ubuntu-cloudimage-keyring file ubuntu-cloudimage-keyring file