mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-23 19:31:31 +00:00
Imported 2.639
No reason for CPC update specified.
This commit is contained in:
CloudBuilder
parent
5808f0315d
commit
92108eae77
17
debian/changelog
vendored
17
debian/changelog
vendored
@ -1,3 +1,20 @@
|
||||
livecd-rootfs (2.639) focal; urgency=medium
|
||||
|
||||
* On s390x subiquity:
|
||||
- enable cloud-init
|
||||
- make cloud-init handle the default/baked in networking configuration
|
||||
- install and enable openssh-server for the installation only
|
||||
- provide cloud.cfg that generates random installer user password
|
||||
- disable subiquity on sclp_line0 line based console
|
||||
|
||||
-- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 29 Jan 2020 14:16:09 +0000
|
||||
|
||||
livecd-rootfs (2.638) focal; urgency=medium
|
||||
|
||||
* Install oem-20.04 kernel flavour on Ubuntu Desktop builds.
|
||||
|
||||
-- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 28 Jan 2020 15:06:02 +0000
|
||||
|
||||
livecd-rootfs (2.637) focal; urgency=medium
|
||||
|
||||
* Ensure seed partition is mounted on no-cloud images which use system-boot
|
||||
|
||||
@ -552,7 +552,7 @@ case $PROJECT in
|
||||
LIVE_TASK='ubuntu-live'
|
||||
add_task install minimal standard ubuntu-desktop
|
||||
add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
|
||||
KERNEL_FLAVOURS='generic'
|
||||
KERNEL_FLAVOURS='generic oem-20.04'
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
@ -65,7 +65,11 @@ chroot $INSTALLER_ROOT apt-get -y install lupin-casper
|
||||
# Install linux-firmware for kernel to upload into hardware.
|
||||
chroot $INSTALLER_ROOT apt-get -y install linux-firmware
|
||||
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 openssh-server
|
||||
rm $INSTALLER_ROOT/etc/netplan/00-installer-config.yaml
|
||||
else
|
||||
# Don't let cloud-init run in the live session.
|
||||
touch $INSTALLER_ROOT/etc/cloud/cloud-init.disabled
|
||||
fi
|
||||
chroot $INSTALLER_ROOT apt-get clean
|
||||
|
||||
@ -73,9 +77,6 @@ chroot $INSTALLER_ROOT apt-get clean
|
||||
# "helpful" casper script that mounts any swap partitions it finds.
|
||||
rm -f $INSTALLER_ROOT/usr/share/initramfs-tools/scripts/casper-bottom/*swap
|
||||
|
||||
# Don't let cloud-init run in the live session.
|
||||
touch $INSTALLER_ROOT/etc/cloud/cloud-init.disabled
|
||||
|
||||
# Preseed subiquity into installer layer
|
||||
snap_prepare $INSTALLER_ROOT
|
||||
snap_preseed $INSTALLER_ROOT subiquity/classic
|
||||
|
||||
@ -0,0 +1,116 @@
|
||||
# The top level settings are used as module
|
||||
# and system configuration.
|
||||
|
||||
# A set of users which may be applied and/or used by various modules
|
||||
# when a 'default' entry is found it will reference the 'default_user'
|
||||
# from the distro configuration specified below
|
||||
users:
|
||||
- default
|
||||
|
||||
# If this is set, 'root' will not be able to ssh in and they
|
||||
# will get a message to login instead as the default $user
|
||||
disable_root: true
|
||||
|
||||
# This will cause the set+update hostname module to not operate (if true)
|
||||
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.
|
||||
network:
|
||||
version: 2
|
||||
ethernets:
|
||||
all-en:
|
||||
match:
|
||||
name: "en*"
|
||||
dhcp4: true
|
||||
all-eth:
|
||||
match:
|
||||
name: "eth*"
|
||||
dhcp4: true
|
||||
|
||||
# Example datasource config
|
||||
# datasource:
|
||||
# Ec2:
|
||||
# metadata_urls: [ 'blah.com' ]
|
||||
# timeout: 5 # (defaults to 50 seconds)
|
||||
# max_wait: 10 # (defaults to 120 seconds)
|
||||
|
||||
# The modules that run in the 'init' stage
|
||||
cloud_init_modules:
|
||||
- bootcmd
|
||||
- write-files
|
||||
- ca-certs
|
||||
- rsyslog
|
||||
- users-groups
|
||||
- ssh
|
||||
|
||||
# The modules that run in the 'config' stage
|
||||
cloud_config_modules:
|
||||
# Emit the cloud config ready event
|
||||
# this can be used by upstart jobs for 'start on cloud-config'.
|
||||
- ssh-import-id
|
||||
- set-passwords
|
||||
- timezone
|
||||
- disable-ec2-metadata
|
||||
- runcmd
|
||||
|
||||
# The modules that run in the 'final' stage
|
||||
cloud_final_modules:
|
||||
- scripts-per-once
|
||||
- ssh-authkey-fingerprints
|
||||
- keys-to-console
|
||||
- phone-home
|
||||
- final-message
|
||||
|
||||
# System and/or distro specific settings
|
||||
# (not accessible to handlers/transforms)
|
||||
system_info:
|
||||
# This will affect which distro class gets used
|
||||
distro: ubuntu
|
||||
# Default user name + that default users groups (if added/used)
|
||||
default_user:
|
||||
name: installer
|
||||
lock_passwd: false
|
||||
gecos: Ubuntu
|
||||
groups: [adm, audio, cdrom, dialout, dip, floppy, lxd, netdev, plugdev, sudo, video]
|
||||
sudo: ["ALL=(ALL) NOPASSWD:ALL"]
|
||||
shell: /usr/bin/subiquity-shell
|
||||
# Automatically discover the best ntp_client
|
||||
ntp_client: auto
|
||||
# Other config here will be given to the distro class and/or path classes
|
||||
paths:
|
||||
cloud_dir: /var/lib/cloud/
|
||||
templates_dir: /etc/cloud/templates/
|
||||
upstart_dir: /etc/init/
|
||||
package_mirrors:
|
||||
- arches: [i386, amd64]
|
||||
failsafe:
|
||||
primary: http://archive.ubuntu.com/ubuntu
|
||||
security: http://security.ubuntu.com/ubuntu
|
||||
search:
|
||||
primary:
|
||||
- http://%(ec2_region)s.ec2.archive.ubuntu.com/ubuntu/
|
||||
- http://%(availability_zone)s.clouds.archive.ubuntu.com/ubuntu/
|
||||
- http://%(region)s.clouds.archive.ubuntu.com/ubuntu/
|
||||
security: []
|
||||
- arches: [arm64, armel, armhf]
|
||||
failsafe:
|
||||
primary: http://ports.ubuntu.com/ubuntu-ports
|
||||
security: http://ports.ubuntu.com/ubuntu-ports
|
||||
search:
|
||||
primary:
|
||||
- http://%(ec2_region)s.ec2.ports.ubuntu.com/ubuntu-ports/
|
||||
- http://%(availability_zone)s.clouds.ports.ubuntu.com/ubuntu-ports/
|
||||
- http://%(region)s.clouds.ports.ubuntu.com/ubuntu-ports/
|
||||
security: []
|
||||
- arches: [default]
|
||||
failsafe:
|
||||
primary: http://ports.ubuntu.com/ubuntu-ports
|
||||
security: http://ports.ubuntu.com/ubuntu-ports
|
||||
ssh_svcname: ssh
|
||||
@ -0,0 +1,2 @@
|
||||
policy: search,found=first,maybe=none,notfound=enabled
|
||||
datasource: None
|
||||
3
live-build/ubuntu-server/includes.binary/overlay/usr/bin/subiquity-shell
Executable file
3
live-build/ubuntu-server/includes.binary/overlay/usr/bin/subiquity-shell
Executable file
@ -0,0 +1,3 @@
|
||||
#!/bin/sh
|
||||
exec sudo snap run subiquity
|
||||
|
||||
@ -0,0 +1,2 @@
|
||||
[Service]
|
||||
ExecStartPre=
|
||||
Loading…
x
Reference in New Issue
Block a user