Compare commits

..

No commits in common. "ubuntu/master" and "25.10.17" have entirely different histories.

4 changed files with 2 additions and 18 deletions

12
debian/changelog vendored
View File

@ -1,15 +1,3 @@
livecd-rootfs (25.10.19) questing; urgency=medium
* Increase default image size for buildd.
-- Denis Lalaj <denis.lalaj@canonical.com> Tue, 09 Sep 2025 16:53:52 -0600
livecd-rootfs (25.10.18) questing; urgency=medium
* desktop: use dracut
-- Dan Bungert <daniel.bungert@canonical.com> Mon, 08 Sep 2025 17:00:46 -0600
livecd-rootfs (25.10.17) questing; urgency=medium livecd-rootfs (25.10.17) questing; urgency=medium
[ Tim Andersson ] [ Tim Andersson ]

View File

@ -844,7 +844,6 @@ case $PROJECT in
HAS_DEFAULT_LANGUAGES=yes HAS_DEFAULT_LANGUAGES=yes
LANGUAGE_BASE=desktop LANGUAGE_BASE=desktop
KERNEL_FLAVOURS='generic-hwe-24.04' KERNEL_FLAVOURS='generic-hwe-24.04'
NEEDS_DRACUT=yes
case $SUBARCH in case $SUBARCH in
nvidia) nvidia)

View File

@ -137,9 +137,7 @@ EOF
disk_image=binary/boot/disk-uefi.ext4 disk_image=binary/boot/disk-uefi.ext4
# Adjust the image size to accomodate increasing package sizes create_empty_disk_image "${disk_image}"
size=$(( imagesize*115/100 ))
create_empty_disk_image "${disk_image}" "${size}"
create_partitions "${disk_image}" create_partitions "${disk_image}"
mount_image "${disk_image}" 1 mount_image "${disk_image}" 1

View File

@ -33,8 +33,7 @@ clean_loops() {
create_empty_disk_image() { create_empty_disk_image() {
# Prepare an empty disk image # Prepare an empty disk image
size=${2:-$imagesize} dd if=/dev/zero of="$1" bs=1 count=0 seek="${imagesize}"
dd if=/dev/zero of="$1" bs=1 count=0 seek="${size}"
} }
create_manifest() { create_manifest() {