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

Imported 2.640

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-01-30 20:19:06 +00:00
parent 92108eae77
commit e35255b2b5
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (2.640) focal; urgency=medium
* Although the request flavour to install is oem-20.04, it really is
called just oem on disk. Override the flavour name from oem-20.04 to
oem when renaming built artefacts. This also means that ubuntu-cdimage
needs to simply download 'oem' vmlinuz+initrd pairs, not 'oem-20.04'.
-- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 30 Jan 2020 11:52:32 +0000
livecd-rootfs (2.639) focal; urgency=medium
* On s390x subiquity:

12
live-build/auto/build
View File

@ -819,10 +819,14 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
continue
fi
if [ "$FLAVOUR" = "virtual" ]; then
# The virtual kernel is named generic in /boot
FLAVOUR="generic"
fi
case $FLAVOUR in
virtual)
FLAVOUR="generic"
;;
oem-*)
FLAVOUR="oem"
;;
esac
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
if [ -z "$KVERS" ]; then
if [ -e "binary/$INITFS/vmlinuz" ]; then