Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-12 03:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge lp:~rbalint/livecd-rootfs/minimize-1g

Browse Source 
* Zero fill space in UEFI partitions, too
* Set LB_ISO_PREPARER to livecd-rootfs to avoid unbound variable in default string
* Build minimized images in a 1GiB image
This commit is contained in:
Balint Reczey 2017-12-01 22:13:48 +01:00
commit 0dc6880b47
6 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -6,8 +6,11 @@ livecd-rootfs (2.485) UNRELEASED; urgency=medium
[ Balint Reczey ] [ Balint Reczey ]
* Use default xz compression (-6) for raspi2 image. * Use default xz compression (-6) for raspi2 image.
Xz with -0 generated ~35% bigger compressed image. (LP: #1732681) Xz with -0 generated ~35% bigger compressed image. (LP: #1732681)
* Zero fill space in UEFI partitions, too
* Set LB_ISO_PREPARER to livecd-rootfs to avoid unbound variable in default string
* Build minimized images in a 1GiB image
-- Balint Reczey <rbalint@ubuntu.com> Mon, 20 Nov 2017 21:18:53 +0100 -- Balint Reczey <rbalint@ubuntu.com> Thu, 23 Nov 2017 20:29:29 +0100
livecd-rootfs (2.484) bionic; urgency=medium livecd-rootfs (2.484) bionic; urgency=medium

6
live-build/auto/config
View File

@ -694,6 +694,7 @@ esac
lb config noauto \ lb config noauto \
--mode ubuntu \ --mode ubuntu \
--distribution "$SUITE" \ --distribution "$SUITE" \
--iso-preparer "livecd-rootfs" \
--bootstrap-keyring ubuntu-keyring \ --bootstrap-keyring ubuntu-keyring \
--binary-images "$BINARY_IMAGES" \ --binary-images "$BINARY_IMAGES" \
--memtest "$MEMTEST" \ --memtest "$MEMTEST" \
@ -716,6 +717,11 @@ echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/chroot
echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
echo "BUILDSTAMP=\"$NOW\"" >> config/binary echo "BUILDSTAMP=\"$NOW\"" >> config/binary
echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/binary
if [ "${SUBPROJECT:-}" = minimized ]; then
# try building minimized images in a 1GiB image but still allow overriding
# IMAGE_SIZE in lb build
echo 'IMAGE_SIZE=${IMAGE_SIZE:-'$((1024*1024*1024))'}' >> config/binary
fi
case $ARCH+$SUBARCH in case $ARCH+$SUBARCH in
armhf+raspi2) armhf+raspi2)

3
live-build/functions
View File

@ -171,6 +171,9 @@ umount_disk_image() {
local uefi_dev="/dev/mapper${loop_device///dev/}p15" local uefi_dev="/dev/mapper${loop_device///dev/}p15"
if [ -e "$mountpoint/boot/efi" -a -b "$uefi_dev" ]; then if [ -e "$mountpoint/boot/efi" -a -b "$uefi_dev" ]; then
# zero fill free space in UEFI partition
cat < /dev/zero > "$mountpoint/boot/efi/bloat_file" 2> /dev/null || true
rm "$mountpoint/boot/efi/bloat_file"
umount --detach-loop "$mountpoint/boot/efi" umount --detach-loop "$mountpoint/boot/efi"
fi fi

4
live-build/ubuntu-cpc/hooks/032-disk-image.binary
View File

@ -3,10 +3,10 @@
IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process" IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
FS_LABEL="cloudimg-rootfs" FS_LABEL="cloudimg-rootfs"
. config/functions
. config/binary . config/binary
. config/functions
BOOTPART_START= BOOTPART_START=
BOOTPART_END= BOOTPART_END=
BOOT_MOUNTPOINT= BOOT_MOUNTPOINT=

2
live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary
View File

@ -12,6 +12,8 @@ esac
IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process" IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
FS_LABEL="cloudimg-rootfs" FS_LABEL="cloudimg-rootfs"
. config/binary
. config/functions . config/functions
create_partitions() { create_partitions() {

2
live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary
View File

@ -10,6 +10,8 @@ esac
IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process" IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
FS_LABEL="cloudimg-rootfs" FS_LABEL="cloudimg-rootfs"
. config/binary
. config/functions . config/functions
create_partitions() { create_partitions() {