Print subiquity ssh login details on s390x line based consoles.

This commit is contained in:
Dimitri John Ledkov 2020-04-16 23:54:27 +01:00
parent d5850291ca
commit a21a67ab52
3 changed files with 13 additions and 1 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.662) UNRELEASED; urgency=medium
* Print subiquity ssh login details on s390x line based consoles.
-- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 16 Apr 2020 23:53:32 +0100
livecd-rootfs (2.661) focal; urgency=medium livecd-rootfs (2.661) focal; urgency=medium
* Switch Ubuntu desktop to only hwe-20.04 kernel flavour. * Switch Ubuntu desktop to only hwe-20.04 kernel flavour.

View File

@ -66,7 +66,9 @@ printf "%s\t%s\t%s\t%s\n" \
chroot $INSTALLER_ROOT dpkg-reconfigure --frontend=noninteractive cloud-init chroot $INSTALLER_ROOT dpkg-reconfigure --frontend=noninteractive cloud-init
if [ `dpkg --print-architecture` = s390x ]; then 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 fi
chroot $INSTALLER_ROOT apt-get clean chroot $INSTALLER_ROOT apt-get clean

View File

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