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

auto/config: scope ubuntu:desktop-preinstalled:raspi image options

Browse Source 
When desktop-preinstalled image options were added in
38157b37487d244b27af33f7863e6b15253c8f94, for the raspi subarch, the
options listed there were not scoped for raspi subarch. This results
in those options getting also applied for the HYPERV
ubuntu:desktop-preinstalled image.

Thus scope the newly added options under raspi subarch case only.

(cherry picked from commit 1c7d688319490a8a15a5aab47fb086482b3efe92)

LP: #1901846
This commit is contained in:
Dimitri John Ledkov 2020-10-27 20:42:08 +00:00
parent aeb9e39ec9
commit 4aedf53772
No known key found for this signature in database
GPG Key ID: 9B8EC849D5EF70ED
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
live-build/auto/config
View File

@ -604,14 +604,16 @@ case $PROJECT in
add_task install minimal standard ubuntu-desktop
if [ "$SUBARCH" = "raspi" ]; then
add_task install ubuntu-desktop-raspi
# XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project
# for existing raspi preinstalled images
# XXX: I would prefer to use --hdd-label=desktop-rootfs like 040-hyperv-desktop-images.binary
OPTS="${OPTS:+$OPTS }--initramfs=none"
OPTS="${OPTS:+$OPTS }--system=normal"
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
fi
# XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project
# for existing raspi preinstalled images
OPTS="${OPTS:+$OPTS }--initramfs=none"
OPTS="${OPTS:+$OPTS }--system=normal"
OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
## Otherwise HYPERV image options.... *crickets* see the hyperv hook
;;
*)