Imported 2.663

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,19 @@
+livecd-rootfs (2.663) focal; urgency=medium
+
+  * Run snap info on the downloaded snap, rather than against the
+    store. First of all snap info doesn't have --channel argument, thus
+    queries the wrong channel, and depening on the cohort, a different
+    snap might be visible too. Thus seed the base of the snap revision we
+    dowanloaded, rather than some random one from the store.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 17 Apr 2020 00:10:41 +0100
+
+livecd-rootfs (2.662) focal; urgency=medium
+
+  * Print subiquity ssh login details on s390x line based consoles.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 16 Apr 2020 23:54:33 +0100
+
 livecd-rootfs (2.661) focal; urgency=medium
 
   * Switch Ubuntu desktop to only hwe-20.04 kernel flavour.

live-build/functions

@@ -482,6 +482,24 @@ _snap_preseed() {
         return
     fi
 
+    sh -c "
+        set -x;
+        cd \"$CHROOT_ROOT/var/lib/snapd/seed\";
+        SNAPPY_STORE_NO_CDN=1 snap download \
+            --cohort="${COHORT_KEY:-}" \
+            --channel=\"$CHANNEL\" \"$SNAP_NAME\"" || snap_download_failed=1
+    if [ $snap_download_failed = 1 ] ; then
+        echo "If the channel ($CHANNEL) includes '*/ubuntu-##.##' track per "
+        echo "Ubuntu policy (ex. stable/ubuntu-18.04) the publisher will need "
+        echo "to temporarily create the channel/track to allow fallback during"
+        echo "download (ex. stable/ubuntu-18.04 falls back to stable if the"
+        echo "prior had been created in the past)."
+        exit 1
+    fi
+
+    mv -v $seed_dir/*.assert $assertions_dir
+    mv -v $seed_dir/*.snap $snaps_dir
+
     # Pre-seed snap's base
     case $SNAP_NAME in
         snapd)
@@ -494,7 +512,8 @@ _snap_preseed() {
             # Determine which core snap is needed
             local snap_info
 
-            snap_info=$(snap info --verbose "${SNAP_NAME}")
+            # snap info doesn't have --channel, so must run agains the downloaded snap
+            snap_info=$(snap info --verbose ${snaps_dir}/${SNAP_NAME}_[0-9]*.snap)
 
             if [ $? -ne 0 ]; then
                 echo "Failed to retrieve base of $SNAP_NAME!"
@@ -510,24 +529,6 @@ _snap_preseed() {
             ;;
     esac
 
-    sh -c "
-        set -x;
-        cd \"$CHROOT_ROOT/var/lib/snapd/seed\";
-        SNAPPY_STORE_NO_CDN=1 snap download \
-            --cohort="${COHORT_KEY:-}" \
-            --channel=\"$CHANNEL\" \"$SNAP_NAME\"" || snap_download_failed=1
-    if [ $snap_download_failed = 1 ] ; then
-        echo "If the channel ($CHANNEL) includes '*/ubuntu-##.##' track per "
-        echo "Ubuntu policy (ex. stable/ubuntu-18.04) the publisher will need "
-        echo "to temporarily create the channel/track to allow fallback during"
-        echo "download (ex. stable/ubuntu-18.04 falls back to stable if the"
-        echo "prior had been created in the past)."
-        exit 1
-    fi
-
-    mv -v $seed_dir/*.assert $assertions_dir
-    mv -v $seed_dir/*.snap $snaps_dir
-
     # Add the snap to the seed.yaml
     ! [ -e $seed_yaml ] && echo "snaps:" > $seed_yaml
     cat <<EOF >> $seed_yaml

live-build/ubuntu-server/hooks/032-installer-squashfs.binary

@@ -66,7 +66,9 @@ printf "%s\t%s\t%s\t%s\n" \
 chroot $INSTALLER_ROOT dpkg-reconfigure --frontend=noninteractive cloud-init
 
 if [ `dpkg --print-architecture` = s390x ]; then
-	chroot $INSTALLER_ROOT apt-get -y install s390-tools-zkey
+    chroot $INSTALLER_ROOT apt-get -y install s390-tools-zkey
+    # because z/VM x3270 is just ttyS0
+    cp -r $INSTALLER_ROOT/usr/lib/systemd/system/serial-getty@sclp_line0.service.d $INSTALLER_ROOT/usr/lib/systemd/system/serial-getty@ttyS0.service.d
 fi
 chroot $INSTALLER_ROOT apt-get clean
 

live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/serial-getty@sclp_line0.service.d/subiquity-serial.conf

@@ -1,2 +1,6 @@
+[Unit]
+After=cloud-final.service snapd.seeded.service
 [Service]
+StandardOutput=tty
 ExecStartPre=
+ExecStartPre=/usr/bin/snap run subiquity --ssh