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

Merge branch 'unbreak-hyperv-desktop-preinstalled' of https://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Dimitri John Ledkov 2020-10-28 10:36:22 +00:00
commit eae27b6737
No known key found for this signature in database
GPG Key ID: 9B8EC849D5EF70ED
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
live-build/auto/config
View File

@ -601,17 +601,19 @@ case $PROJECT in
;; ;;
desktop-preinstalled) desktop-preinstalled)
add_task install minimal standard add_task install minimal standard ubuntu-desktop
if [ "$SUBARCH" = "raspi" ]; then if [ "$SUBARCH" = "raspi" ]; then
add_task install ubuntu-desktop-raspi 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 fi
# XXX: Are those actually needed? I see we use those for ubuntu-cpc, which is the project ## Otherwise HYPERV image options.... *crickets* see the hyperv hook
# 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"
;; ;;
*) *)