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

support specify sector size in ubuntu-image

Browse Source 
Signed-off-by: Zhai Zhaoxuan <zhai.zhaoxuan@canonical.com>
This commit is contained in:
Zhai Zhaoxuan 2024-04-24 14:38:33 +08:00 committed by Zhaoxuan Zhai
parent 782d564441
commit f189a4e680
No known key found for this signature in database
GPG Key ID: E0D916129DAB6910
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,8 +1,12 @@
livecd-rootfs (24.10.5) UNRELEASED; urgency=medium livecd-rootfs (24.10.5ubuntu1) UNRELEASED; urgency=medium
[ Erich Eickmeyer ]
* Switch Ubuntu Studio to generic kernel * Switch Ubuntu Studio to generic kernel
-- Erich Eickmeyer <eeickmeyer@ubuntu.com> Wed, 19 Jun 2024 15:52:04 -0700 [ Zhaoxuan Zhai ]
* support config sector size in ubuntu-image
-- Zhaoxuan Zhai <zhai.zhaoxuan@canonical.com> Thu, 27 Jun 2024 09:58:27 +0800
livecd-rootfs (24.10.4) oracular; urgency=medium livecd-rootfs (24.10.4) oracular; urgency=medium

5
live-build/auto/config
View File

@ -464,6 +464,9 @@ case $IMAGEFORMAT in
echo "$NOW" > config/disk-info echo "$NOW" > config/disk-info
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --disk-info config/disk-info" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --disk-info config/disk-info"
fi fi
if [ -n "$SECTOR_SIZE" ]; then
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --sector-size=$SECTOR_SIZE"
fi
if [ $PROJECT = "ubuntu-core" ]; then if [ $PROJECT = "ubuntu-core" ]; then
# snap-based core images # snap-based core images
@ -521,7 +524,6 @@ case $IMAGEFORMAT in
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --snap=$snap" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --snap=$snap"
done done
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
# Store model assertion in top dir to get it picked up later as a build artifact # Store model assertion in top dir to get it picked up later as a build artifact
env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion
echo "Configured ubuntu-image for the following model assertion:" echo "Configured ubuntu-image for the following model assertion:"
@ -551,6 +553,7 @@ case $IMAGEFORMAT in
# Save the model name used for building, mostly for any model-specific hook execution # Save the model name used for building, mostly for any model-specific hook execution
echo "MODEL=$MODEL" >> config/common echo "MODEL=$MODEL" >> config/common
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
# Fake finished configuration for lb build # Fake finished configuration for lb build
mkdir -p .build mkdir -p .build
touch .build/config touch .build/config