mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-03-09 18:31:11 +00:00
Merge branch 'ubuntu/focal' of git+ssh://git.launchpad.net/livecd-rootfs into bdmurray/focal-intel-iot
This commit is contained in:
commit
6568c5fa29
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -1,8 +1,16 @@
|
||||
livecd-rootfs (2.664.25) UNRELEASED; urgency=medium
|
||||
|
||||
[ Brian Murray ]
|
||||
* Add support for creating images (ubuntu-core and classic) with a kernel
|
||||
optimized for Intel IoT devices. (LP: #1938338)
|
||||
|
||||
[ Michael Hudson-Doyle ]
|
||||
* Simplify how the subiquity client is run on the serial console in the live
|
||||
server environment, breaking a unit cycle that sometimes prevents
|
||||
subiquity from starting up at all. (LP: #1888497)
|
||||
* Do not set the password for the installer user via cloud-init as subiquity
|
||||
can now do this itself. (LP: #1933523)
|
||||
|
||||
-- Brian Murray <brian@ubuntu.com> Wed, 28 Jul 2021 13:31:19 -0700
|
||||
|
||||
livecd-rootfs (2.664.24) focal; urgency=medium
|
||||
|
@ -17,8 +17,6 @@ preserve_hostname: true
|
||||
ssh_pwauth: yes
|
||||
chpasswd:
|
||||
expire: false
|
||||
list:
|
||||
- installer:RANDOM
|
||||
|
||||
# This is the initial network config.
|
||||
# It can be overwritten by cloud-init or subiquity.
|
||||
@ -34,7 +32,7 @@ network:
|
||||
name: "eth*"
|
||||
dhcp4: true
|
||||
|
||||
final_message: "## template: jinja\nCloud-init v. {{version}} finished at {{timestamp}}. Datasource {{datasource}}. Up {{uptime}} seconds\n\n\nWelcome to Ubuntu Server Installer!\n\nAbove you will find SSH host keys and a random password set for the `installer` user. You can use these credentials to ssh-in and complete the installation. If you provided SSH keys in the cloud-init datasource, they were also provisioned to the installer user.\n\nIf you have access to the graphical console, like TTY1 or HMC ASCII terminal you can complete the installation there too."
|
||||
# We used to have a custom final_message here. Just use the default instead.
|
||||
|
||||
# Example datasource config
|
||||
# datasource:
|
||||
|
@ -0,0 +1 @@
|
||||
/dev/null
|
@ -1,2 +1,9 @@
|
||||
[Unit]
|
||||
Description=Subiquity, the installer for Ubuntu Server %I
|
||||
After=snapd.seeded.service
|
||||
StartLimitInterval=0
|
||||
|
||||
[Service]
|
||||
ExecStartPre=/bin/systemctl start serial-subiquity@%i.service
|
||||
Environment=SNAP_REEXEC=0
|
||||
ExecStart=
|
||||
ExecStart=/usr/bin/snap run subiquity.subiquity-service %I
|
||||
|
@ -1,6 +1,4 @@
|
||||
[Unit]
|
||||
After=cloud-final.service snapd.seeded.service
|
||||
[Service]
|
||||
StandardOutput=tty
|
||||
ExecStartPre=
|
||||
ExecStartPre=/usr/bin/snap run subiquity --ssh
|
||||
ExecStart=
|
||||
ExecStart=/usr/bin/snap run subiquity --ssh
|
||||
|
@ -1,7 +1,6 @@
|
||||
[Unit]
|
||||
IgnoreOnIsolate=yes
|
||||
After=systemd-user-sessions.service plymouth-quit-wait.service snap.seeded.service
|
||||
ConditionPathExists=!/run/subiquity/complete
|
||||
|
||||
[Service]
|
||||
Environment=SNAP_REEXEC=0
|
||||
|
Loading…
x
Reference in New Issue
Block a user