Imported 2.664.10

No reason for CPC update specified.
CloudBuilder 4 years ago
parent b0dc95cb28
commit 5beab54dee

18
debian/changelog vendored

@ -1,10 +1,24 @@
livecd-rootfs (2.664.8.1) focal; urgency=medium livecd-rootfs (2.664.10) focal; urgency=medium
* Do not hard-code the UC20 amd64 image size to 8GB as now ubuntu-image
should be able to properly calculate the needed size itself.
* But per discussion, we might want to keep the UC20 images a bit bigger than
what's defined via the gadget/rootfs contents, to make sure writable is
comfortably big enough. Use the same hard-coded value as for UC16 and UC18.
(LP: #1905990)
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Fri, 27 Nov 2020 17:58:38 +0100
livecd-rootfs (2.664.9) focal; urgency=medium
[ John Chittum]
* Backport Ensure toolsVersion set in vmdk header (LP: #1893898)
[ Dimitri John Ledkov & Joshua Powers ] [ Dimitri John Ledkov & Joshua Powers ]
* amd64: always install grub-pc with shim-signed (LP: #1901906), and * amd64: always install grub-pc with shim-signed (LP: #1901906), and
ensure to autoremove packages ensure to autoremove packages
-- Robert C Jennings <robert.jennings@canonical.com> Fri, 20 Nov 2020 15:08:54 -0600 -- Robert C Jennings <robert.jennings@canonical.com> Fri, 20 Nov 2020 14:35:51 -0600
livecd-rootfs (2.664.8) focal; urgency=medium livecd-rootfs (2.664.8) focal; urgency=medium

@ -360,14 +360,8 @@ case $IMAGEFORMAT in
case $MODEL in case $MODEL in
pc-amd64|pc-i386) pc-amd64|pc-i386)
if [ -z "${SUBARCH:-}" ]; then if [ -z "${SUBARCH:-}" ]; then
case $SUITE in # This is to make sure there's enough writable space
xenial|bionic) UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
;;
*)
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 8G"
;;
esac
fi fi
;; ;;
*) ;; *) ;;
@ -775,8 +769,7 @@ case $PROJECT in
add_package install grub-pc add_package install grub-pc
;; ;;
amd64) amd64)
add_package install grub-pc-bin add_package install grub-pc
add_package install grub-efi-amd64-signed
add_package install shim-signed add_package install shim-signed
;; ;;
esac esac

@ -242,28 +242,46 @@ modify_vmdk_header() {
# Extract the vmdk header for manipulation # Extract the vmdk header for manipulation
dd if="${vmdk_name}" of="${descriptor}" bs=1 skip=512 count=1024 dd if="${vmdk_name}" of="${descriptor}" bs=1 skip=512 count=1024
echo "Cat'ing original vmdk disk descriptor to console for debugging."
# cat header so we are aware of the original descriptor for debugging
cat $descriptor
# trim null bytes to treat as standard text file
tr -d '\000' < $descriptor > $newdescriptor
# The sed lines below is where the magic is. Specifically:
# ddb.toolsVersion: sets the open-vm-tools so that VMware shows
# the tooling as current
# ddb.virtualHWVersion: set the version to 7, which covers most
# current versions of VMware
# createType: make sure its set to stream Optimized
# remove the vmdk-stream-converter comment and replace with # remove the vmdk-stream-converter comment and replace with
# # Disk DescriptorFile. This is needed for Virtualbox # # Disk DescriptorFile. This is needed for Virtualbox
# remove the comments from vmdk-stream-converter which causes # remove the comments from vmdk-stream-converter which causes
# VirtualBox and others to fail VMDK validation # VirtualBox and others to fail VMDK validation
sed -i -e 's|# Description file.*|# Disk DescriptorFile|' \
sed -e 's|# Description file.*|# Disk DescriptorFile|' \
-e '/# Believe this is random*/d' \ -e '/# Believe this is random*/d' \
-e '/# Indicates no parent/d' \ -e '/# Indicates no parent/d' \
-e '/# The Disk Data Base/d' \ -e '/# The Disk Data Base/d' \
-e 's|ddb.comment.*|ddb.toolsVersion = "2147483647"|' \ ${newdescriptor}
"${descriptor}" > "${newdescriptor}"
# add newline to newdescriptor
echo "" >> $newdescriptor
# add required tools version
echo -n 'ddb.toolsVersion = "2147483647"' >> $newdescriptor
echo "Cat'ing modified descriptor for debugging."
cat $newdescriptor
# diff original descriptor and new descriptor for debugging
# diff exits 1 if difference. pipefail not set so piping diff
# to cat prints diff and swallows exit 1
echo "Printing diff of original and new descriptors."
diff --text $descriptor $newdescriptor | cat
# The header must be 1024 or less before padding
if ! expr $(stat --format=%s ${newdescriptor}) \< 1025 > /dev/null 2>&1; then
echo "descriptor is too large, VMDK will be invalid!";
exit 1
fi
# The header is cannot be bigger than 1024 # reset newdescriptor to be 1024
expr $(stat --format=%s ${newdescriptor}) \< 1024 > /dev/null 2>&1 || { truncate --no-create --size=1K $newdescriptor
echo "descriptor is too large, VMDK will be invalid!"; exit 1; }
# Overwrite the vmdk header with our new, modified one # Overwrite the vmdk header with our new, modified one
dd conv=notrunc,nocreat \ dd conv=notrunc,nocreat \

@ -33,6 +33,7 @@ install_grub() {
chroot mountpoint apt-get -qqy update chroot mountpoint apt-get -qqy update
chroot mountpoint apt-get -qqy install grub-ieee1275 chroot mountpoint apt-get -qqy install grub-ieee1275
chroot mountpoint apt-get -qqy remove --purge grub-legacy-ec2 chroot mountpoint apt-get -qqy remove --purge grub-legacy-ec2
chroot mountpoint apt-get autoremove --purge --assume-yes
# set the kernel commandline to use hvc0 # set the kernel commandline to use hvc0
mkdir -p mountpoint/etc/default/grub.d mkdir -p mountpoint/etc/default/grub.d

@ -97,11 +97,13 @@ install_grub() {
efi_target=arm-efi efi_target=arm-efi
;; ;;
amd64) amd64)
chroot mountpoint apt-get install -qqy grub-efi-amd64-signed shim-signed chroot mountpoint apt-get install -qqy grub-pc shim-signed
efi_target=x86_64-efi efi_target=x86_64-efi
;; ;;
esac esac
chroot mountpoint apt-get autoremove --purge --assume-yes
# This call to rewrite the debian package manifest is added here to capture # This call to rewrite the debian package manifest is added here to capture
# grub-efi packages that otherwise would not make it into the base # grub-efi packages that otherwise would not make it into the base
# manifest. filesystem.packages is moved into place via symlinking to # manifest. filesystem.packages is moved into place via symlinking to

@ -136,6 +136,7 @@ fi
if [ "$ARCH" = "s390x" ]; then if [ "$ARCH" = "s390x" ]; then
# Do ZIPL install bits # Do ZIPL install bits
chroot mountpoint apt-get -qqy install s390-tools sysconfig-hardware chroot mountpoint apt-get -qqy install s390-tools sysconfig-hardware
chroot mountpoint apt-get autoremove --purge --assume-yes
# Write out cloudy zipl.conf for future kernel updates # Write out cloudy zipl.conf for future kernel updates
cat << EOF > mountpoint/etc/zipl.conf cat << EOF > mountpoint/etc/zipl.conf

@ -35,6 +35,7 @@ cp -a rootfs.dir $rootfs_dir
setup_mountpoint $rootfs_dir setup_mountpoint $rootfs_dir
env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get -y -qq install ubuntu-wsl env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get -y -qq install ubuntu-wsl
env DEBIAN_FRONTEND=noninteractive chroot $rootfs_dir apt-get autoremove --purge --assume-yes
create_manifest $rootfs_dir livecd.ubuntu-cpc.wsl.rootfs.manifest create_manifest $rootfs_dir livecd.ubuntu-cpc.wsl.rootfs.manifest
teardown_mountpoint $rootfs_dir teardown_mountpoint $rootfs_dir

Loading…
Cancel
Save