Compare commits

...

11 Commits

Author SHA1 Message Date
Robie Basak
3ca2ea37f9 Changelog for 2.765.4 release
Retaining attribution for Thomas.
2022-07-11 15:47:10 +01:00
Thomas Bechtold
be8c7aed7a Add debian/changelog 2022-07-11 14:16:15 +02:00
Thomas Bechtold
7ed77a5e64 Revert "fix: don't modify ssh_config for ubuntu-cpc projects (LP:1968873)"
This change triggered a bug in cloud-init (see LP:1968873). cloud-init
does not recongnize sshd options set in /etc/ssh/sshd_config.d/ and
cloud-init modifies directly /etc/ssh/sshd_config which gets then
overwritten by settings from /etc/ssh/sshd_config.d/ .

This reverts commit 9a8d7a6e4d7a0b50024df6b92e0711a2f42454a0.
2022-07-11 14:14:49 +02:00
Thomas Bechtold
d93cdfd8c5 add debian/changelog 2022-07-01 09:15:16 +02:00
Thomas Bechtold
9a8d7a6e4d fix: don't modify ssh_config for ubuntu-cpc projects (LP:1968873)
Modifying directly /etc/ssh/sshd_config creates "problems" when
upgrading eg. from Focal to Jammy because the upgrade will ask the
user what to do with the modified config. To avoid that, put the
custom configuration into /etc/ssh/sshd_config.d/ so the upgrade of
openssh-server can just replace /etc/ssh/sshd_config without asking
the user.

(cherry picked from commit b54d24ff3310f7ace00ab08e0dacfdc89e026f1c)
2022-07-01 09:13:53 +02:00
Łukasz 'sil2100' Zemczak
89a7e6a9ac releasing package livecd-rootfs version 2.765.2 2022-06-30 17:31:20 +02:00
Łukasz 'sil2100' Zemczak
71405af933 Merge branch 'jammy-iotg-bump' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/jammy 2022-06-30 17:26:30 +02:00
Simon Poirier
8eb4f2d447 fix: VMware cdrom OVF import requires to be on IDE
This reverts part of a change causing regression with vmware import due to the
cdrom getting moved to SCSI while shifting controller IDs. (LP: #1970795)

(cherry picked from commit 3da8e81bf27f3770f3664a332d8767fa62fd4771)

Conflicts:
        debian/changelog

Conflict solved by copying the debian/changelog entry from the archive.
2022-06-29 12:53:27 +02:00
Łukasz 'sil2100' Zemczak
9261aec27a Add bug numbers 2022-06-28 10:42:12 +02:00
Łukasz 'sil2100' Zemczak
a894c4e85f Make sure the intel-iotg flavor is handled in auto/build 2022-06-13 10:09:31 +02:00
Łukasz 'sil2100' Zemczak
198a2f6faf Switch the intel-iot images to use the linux-intel-iotg kernel instead. 2022-06-10 11:16:19 +02:00
4 changed files with 36 additions and 5 deletions

28
debian/changelog vendored
View File

@ -1,3 +1,31 @@
livecd-rootfs (2.765.4) jammy; urgency=medium
* Revert "don't modify ssh_config for ubuntu-cpc projects (LP:1968873)"
This change triggered a bug in cloud-init (see LP:1968873).
-- Thomas Bechtold <thomas.bechtold@canonical.com> Mon, 11 Jul 2022 14:15:36 +0200
livecd-rootfs (2.765.3) jammy; urgency=medium
* Do not modify /etc/ssh/sshd_config for ubuntu-cpc
project builds (LP: #1968873)
-- Thomas Bechtold <thomas.bechtold@canonical.com> Thu, 30 Jun 2022 19:26:04 +0200
livecd-rootfs (2.765.2) jammy; urgency=medium
* Switch the intel-iot images to use the linux-intel-iotg kernel instead.
(LP: #1980065)
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 30 Jun 2022 17:26:04 +0200
livecd-rootfs (2.764.1) jammy; urgency=medium
* live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl:
Revert OVF cd-rom controller to be IDE for VMWare (LP: #1970795)
-- Simon Poirier <simon.poirier@canonical.com> Thu, 16 Jun 2022 19:34:03 -0400
livecd-rootfs (2.764) jammy; urgency=medium livecd-rootfs (2.764) jammy; urgency=medium
[ Michał Sawicz ] [ Michał Sawicz ]

View File

@ -580,6 +580,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
image-intel) image-intel)
FLAVOUR="intel" FLAVOUR="intel"
;; ;;
intel-iotg*)
FLAVOUR="intel-iotg"
;;
esac esac
KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )" 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 [ -z "$KVERS" ]; then

View File

@ -704,7 +704,7 @@ case $PROJECT in
OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15" OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
;; ;;
intel-iot) intel-iot)
KERNEL_FLAVOURS='image-intel' KERNEL_FLAVOURS='intel-iotg'
COMPONENTS='main restricted' COMPONENTS='main restricted'
OPTS="${OPTS:+$OPTS }--initramfs=none" OPTS="${OPTS:+$OPTS }--initramfs=none"
OPTS="${OPTS:+$OPTS }--system=normal" OPTS="${OPTS:+$OPTS }--system=normal"
@ -723,7 +723,7 @@ case $PROJECT in
add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
KERNEL_FLAVOURS='generic-hwe-22.04' KERNEL_FLAVOURS='generic-hwe-22.04'
if [ "$SUBARCH" = "intel-iot" ]; then if [ "$SUBARCH" = "intel-iot" ]; then
KERNEL_FLAVOURS='image-intel' KERNEL_FLAVOURS='intel-iotg'
COMPONENTS='main restricted' COMPONENTS='main restricted'
fi fi
;; ;;
@ -931,7 +931,7 @@ case $PROJECT in
if [ "${SUBARCH:-}" = "generic" ]; then if [ "${SUBARCH:-}" = "generic" ]; then
KERNEL_FLAVOURS=generic KERNEL_FLAVOURS=generic
elif [ "${SUBARCH:-}" = "intel-iot" ]; then elif [ "${SUBARCH:-}" = "intel-iot" ]; then
KERNEL_FLAVOURS=image-intel KERNEL_FLAVOURS=intel-iotg
COMPONENTS='main restricted' COMPONENTS='main restricted'
OPTS="${OPTS:+$OPTS }--initramfs=none" OPTS="${OPTS:+$OPTS }--initramfs=none"
fi fi
@ -1095,7 +1095,7 @@ case $PROJECT in
case $SUBARCH in case $SUBARCH in
intel-iot) intel-iot)
COMPONENTS='main restricted' COMPONENTS='main restricted'
KERNEL_FLAVOURS='image-intel' KERNEL_FLAVOURS='intel-iotg'
;; ;;
esac esac
;; ;;

View File

@ -130,7 +130,7 @@
<rasd:AutomaticAllocation>false</rasd:AutomaticAllocation> <rasd:AutomaticAllocation>false</rasd:AutomaticAllocation>
<rasd:ElementName>CD-ROM 1</rasd:ElementName> <rasd:ElementName>CD-ROM 1</rasd:ElementName>
<rasd:InstanceID>9</rasd:InstanceID> <rasd:InstanceID>9</rasd:InstanceID>
<rasd:Parent>3</rasd:Parent> <rasd:Parent>5</rasd:Parent>
<rasd:ResourceSubType>vmware.cdrom.remotepassthrough</rasd:ResourceSubType> <rasd:ResourceSubType>vmware.cdrom.remotepassthrough</rasd:ResourceSubType>
<rasd:ResourceType>15</rasd:ResourceType> <rasd:ResourceType>15</rasd:ResourceType>
<vmw:Config ovf:required="false" vmw:key="backing.exclusive" vmw:value="false"/> <vmw:Config ovf:required="false" vmw:key="backing.exclusive" vmw:value="false"/>