Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-13 22:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 1db37274ff3418f274464e542c7662fba2d6242a

New changelog entries:
  [ Michael Hudson-Doyle ]
  * Automount a partition of fixed UUID for giving subiquity canned answers.
  [ Balint Reczey ]
  * Use default xz compression (-6) for raspi2 image.
    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
This commit is contained in:
Michael Hudson-Doyle 2017-12-04 10:51:13 +13:00 committed by usd-importer
parent 1db37274ff
commit faa28a6472
9 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
debian/changelog vendored
View File

@ -1,3 +1,18 @@
livecd-rootfs (2.485) bionic; urgency=medium
[ Michael Hudson-Doyle ]
* Automount a partition of fixed UUID for giving subiquity canned answers.
[ Balint Reczey ]
* Use default xz compression (-6) for raspi2 image.
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
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Mon, 04 Dec 2017 10:51:13 +1300
livecd-rootfs (2.484) bionic; urgency=medium
[ Balint Reczey ]

6
live-build/auto/config
View File

@ -694,6 +694,7 @@ esac
lb config noauto \
--mode ubuntu \
--distribution "$SUITE" \
--iso-preparer "livecd-rootfs" \
--bootstrap-keyring ubuntu-keyring \
--binary-images "$BINARY_IMAGES" \
--memtest "$MEMTEST" \
@ -716,6 +717,11 @@ echo "SUBPROJECT=\"${SUBPROJECT:-}\"" >> config/chroot
echo "LB_BINARY_HOOKS=\"$BINARY_HOOKS\"" >> config/binary
echo "BUILDSTAMP=\"$NOW\"" >> 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
armhf+raspi2)

3
live-build/functions
View File

@ -171,6 +171,9 @@ umount_disk_image() {
local uefi_dev="/dev/mapper${loop_device///dev/}p15"
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"
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"
FS_LABEL="cloudimg-rootfs"
. config/functions
. config/binary
. config/functions
BOOTPART_START=
BOOTPART_END=
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"
FS_LABEL="cloudimg-rootfs"
. config/binary
. config/functions
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"
FS_LABEL="cloudimg-rootfs"
. config/binary
. config/functions
create_partitions() {

2
live-build/ubuntu-cpc/hooks/040-qcow2-image.binary
View File

@ -13,7 +13,7 @@ case $ARCH:$SUBARCH in
# Not sure if any other cloud images use subarch for something that
# should take qcow2 format, so only skipping this on raspi2 for now.
armhf:raspi2)
xz -0 -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz
xz -T4 -c binary/boot/disk.ext4 > livecd.ubuntu-cpc.disk1.img.xz
exit 0
;;
esac

1
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/local-fs.target.wants/subiquity_config.mount Symbolic link
View File

@ -0,0 +1 @@
../subiquity_config.mount

4
live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity_config.mount Normal file
View File

@ -0,0 +1,4 @@
[Mount]
What=/dev/disk/by-uuid/00c629d6-06ab-4dfd-b21e-c3186f34105d
Where=/subiquity_config
Type=ext4