mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-23 03:11:12 +00:00
support specify sector size in ubuntu-image
Signed-off-by: Zhai Zhaoxuan <zhai.zhaoxuan@canonical.com>
This commit is contained in:
parent
782d564441
commit
f189a4e680
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -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
|
||||
|
||||
-- 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
|
||||
|
||||
|
@ -464,6 +464,9 @@ case $IMAGEFORMAT in
|
||||
echo "$NOW" > config/disk-info
|
||||
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --disk-info config/disk-info"
|
||||
fi
|
||||
if [ -n "$SECTOR_SIZE" ]; then
|
||||
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --sector-size=$SECTOR_SIZE"
|
||||
fi
|
||||
|
||||
if [ $PROJECT = "ubuntu-core" ]; then
|
||||
# snap-based core images
|
||||
@ -521,7 +524,6 @@ case $IMAGEFORMAT in
|
||||
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --snap=$snap"
|
||||
done
|
||||
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
|
||||
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:"
|
||||
@ -551,6 +553,7 @@ case $IMAGEFORMAT in
|
||||
# Save the model name used for building, mostly for any model-specific hook execution
|
||||
echo "MODEL=$MODEL" >> config/common
|
||||
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
|
||||
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
|
||||
# Fake finished configuration for lb build
|
||||
mkdir -p .build
|
||||
touch .build/config
|
||||
|
Loading…
x
Reference in New Issue
Block a user