mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-05-11 02:41:33 +00:00
Add 'ubuntu-core-installer' project.
The ubuntu-core-installer image is an installer that installs ubuntu core. The environment the installer runs in is similar to the server installer but it has a source catalog entry that points to the model created in ubuntu-core-installer/hooks/05-prepare-image.binary, which subiquity knows how to install.
This commit is contained in:
parent
2215660a7d
commit
0df4234c28
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
|||||||
|
livecd-rootfs (24.04.75) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
|
* Add 'ubuntu-core-installer' project.
|
||||||
|
|
||||||
|
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Thu, 25 Jul 2024 17:26:08 +1200
|
||||||
|
|
||||||
livecd-rootfs (24.04.74) noble; urgency=medium
|
livecd-rootfs (24.04.74) noble; urgency=medium
|
||||||
|
|
||||||
* riscv64: preinstalled server image for Microchip PIC64GX Curiosity Kit
|
* riscv64: preinstalled server image for Microchip PIC64GX Curiosity Kit
|
||||||
|
@ -382,7 +382,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
ubuntu-server:live|ubuntu-mini-iso:)
|
ubuntu-server:live|ubuntu-mini-iso:|ubuntu-core-installer:)
|
||||||
IMAGEFORMAT=plain
|
IMAGEFORMAT=plain
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@ -422,7 +422,7 @@ case $IMAGEFORMAT in
|
|||||||
;;
|
;;
|
||||||
plain)
|
plain)
|
||||||
case $PROJECT:${SUBPROJECT:-} in
|
case $PROJECT:${SUBPROJECT:-} in
|
||||||
ubuntu-server:live)
|
ubuntu-server:live|ubuntu-core-installer:)
|
||||||
touch config/universe-enabled
|
touch config/universe-enabled
|
||||||
;;
|
;;
|
||||||
ubuntu-mini-iso:)
|
ubuntu-mini-iso:)
|
||||||
@ -1047,6 +1047,22 @@ case $PROJECT in
|
|||||||
PREINSTALL_POOL_SEEDS='server-ship'
|
PREINSTALL_POOL_SEEDS='server-ship'
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
ubuntu-core-installer)
|
||||||
|
# The ubuntu-core-installer image is an installer that installs ubuntu
|
||||||
|
# core. The environment the installer runs in is similar to the server
|
||||||
|
# installer but it has a source catalog entry that points to the model
|
||||||
|
# created in ubuntu-core-installer/hooks/05-prepare-image.binary, which
|
||||||
|
# subiquity knows how to install.
|
||||||
|
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
|
||||||
|
PASSES_TO_LAYERS=true
|
||||||
|
add_task base server-minimal server
|
||||||
|
add_task base.live server-live
|
||||||
|
add_package base.live linux-image-generic
|
||||||
|
|
||||||
|
/usr/share/livecd-rootfs/checkout-translations-branch \
|
||||||
|
https://git.launchpad.net/subiquity po config/catalog-translations
|
||||||
|
;;
|
||||||
|
|
||||||
ubuntu-mini-iso)
|
ubuntu-mini-iso)
|
||||||
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
|
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
|
||||||
|
|
||||||
@ -1242,7 +1258,7 @@ case "$ARCH${SUBARCH:++$SUBARCH}" in
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
case $PROJECT:${SUBPROJECT:-} in
|
case $PROJECT:${SUBPROJECT:-} in
|
||||||
ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*)
|
ubuntu-server:*|ubuntu-base:*|ubuntu-oci:*|ubuntu-core-installer:*)
|
||||||
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
|
OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
|
||||||
KERNEL_FLAVOURS=none
|
KERNEL_FLAVOURS=none
|
||||||
BINARY_REMOVE_LINUX=false
|
BINARY_REMOVE_LINUX=false
|
||||||
@ -1439,7 +1455,7 @@ case $PROJECT:${SUBPROJECT:-} in
|
|||||||
ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
|
ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
|
||||||
ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*| \
|
ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*| \
|
||||||
ubuntustudio-dvd:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*|xubuntu:*| \
|
ubuntustudio-dvd:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*|xubuntu:*| \
|
||||||
ubuntukylin:*|ubuntu-mate:*|ubuntu-core-desktop:*)
|
ubuntukylin:*|ubuntu-mate:*|ubuntu-core-desktop:*|ubuntu-core-installer:*)
|
||||||
# Ensure that most things e.g. includes.chroot are copied as is
|
# Ensure that most things e.g. includes.chroot are copied as is
|
||||||
for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
|
for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
|
||||||
case $entry in
|
case $entry in
|
||||||
|
5
live-build/ubuntu-core-installer/hooks/01-setup_modules.chroot
Executable file
5
live-build/ubuntu-core-installer/hooks/01-setup_modules.chroot
Executable file
@ -0,0 +1,5 @@
|
|||||||
|
#!/bin/sh -x
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
mkdir -p /lib/modules
|
17
live-build/ubuntu-core-installer/hooks/02-installer-bits.chroot
Executable file
17
live-build/ubuntu-core-installer/hooks/02-installer-bits.chroot
Executable file
@ -0,0 +1,17 @@
|
|||||||
|
#!/bin/bash -ex
|
||||||
|
# vi: ts=4 noexpandtab
|
||||||
|
|
||||||
|
if [ "${PASS}" != "base.live" ]; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Make sure NoCloud is last
|
||||||
|
values=$(echo get cloud-init/datasources | debconf-communicate | sed 's/^0 //;s/NoCloud, //;s/None/NoCloud, None/')
|
||||||
|
printf "%s\t%s\t%s\t%s\n" \
|
||||||
|
cloud-init cloud-init/datasources multiselect "$values" | debconf-set-selections
|
||||||
|
dpkg-reconfigure --frontend=noninteractive cloud-init
|
||||||
|
|
||||||
|
if [ `dpkg --print-architecture` = s390x ]; then
|
||||||
|
# because z/VM x3270 is just ttyS0
|
||||||
|
cp -r /usr/lib/systemd/system/serial-getty@sclp_line0.service.d /usr/lib/systemd/system/serial-getty@ttyS0.service.d
|
||||||
|
fi
|
19
live-build/ubuntu-core-installer/hooks/03-kernel-metapkg.chroot_early
Executable file
19
live-build/ubuntu-core-installer/hooks/03-kernel-metapkg.chroot_early
Executable file
@ -0,0 +1,19 @@
|
|||||||
|
#!/bin/bash -ex
|
||||||
|
# vi: ts=4 noexpandtab
|
||||||
|
|
||||||
|
case $PASS in
|
||||||
|
base.live)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
|
||||||
|
cat <<EOF > /etc/initramfs-tools/conf.d/casperize.conf
|
||||||
|
export CASPER_GENERATE_UUID=1
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat <<EOF > /etc/initramfs-tools/conf.d/default-layer.conf
|
||||||
|
LAYERFS_PATH=${PASS}.squashfs
|
||||||
|
EOF
|
17
live-build/ubuntu-core-installer/hooks/04-kernel-bits.binary
Executable file
17
live-build/ubuntu-core-installer/hooks/04-kernel-bits.binary
Executable file
@ -0,0 +1,17 @@
|
|||||||
|
#!/bin/bash -eux
|
||||||
|
# vi: ts=4 noexpandtab
|
||||||
|
|
||||||
|
case $PASS in
|
||||||
|
base.live)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
PROJECT=$PROJECT${SUBARCH:+-$SUBARCH}
|
||||||
|
|
||||||
|
# Fish out generated kernel image and initrd
|
||||||
|
mv chroot/boot/initrd.img-* ${PWD}/livecd.${PROJECT}.initrd-generic
|
||||||
|
mv chroot/boot/vmlinu?-* ${PWD}/livecd.${PROJECT}.kernel-generic
|
||||||
|
chmod a+r ${PWD}/livecd.${PROJECT}.initrd-generic ${PWD}/livecd.${PROJECT}.kernel-generic
|
@ -0,0 +1,38 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -eux
|
||||||
|
|
||||||
|
case ${PASS:-} in
|
||||||
|
base.live)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
. config/binary
|
||||||
|
. config/functions
|
||||||
|
|
||||||
|
env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-core-24-amd64 > config/ubuntu-core-24-amd64.model
|
||||||
|
|
||||||
|
env SNAPPY_STORE_NO_CDN=1 snap prepare-image \
|
||||||
|
config/ubuntu-core-24-amd64.model --snap console-conf chroot
|
||||||
|
mv chroot/system-seed/systems/* chroot/system-seed/systems/ubuntu-core-24-amd64
|
||||||
|
rsync -av chroot/system-seed/{systems,snaps} chroot/var/lib/snapd/seed
|
||||||
|
rm -rf chroot/system-seed
|
||||||
|
|
||||||
|
cat <<-EOF > config/edge.catalog-in.yaml
|
||||||
|
name: "Ubuntu Core 24"
|
||||||
|
description: >-
|
||||||
|
Ubuntu Core.
|
||||||
|
id: ubuntu-core
|
||||||
|
type: null
|
||||||
|
variant: core
|
||||||
|
locale_support: none
|
||||||
|
snapd_system_label: ubuntu-core-24-amd64
|
||||||
|
EOF
|
||||||
|
PROJECT_FULL=$PROJECT${SUBARCH:+-$SUBARCH}
|
||||||
|
usc_opts="--output livecd.${PROJECT_FULL}.install-sources.yaml \
|
||||||
|
--template config/edge.catalog-in.yaml \
|
||||||
|
--size 0"
|
||||||
|
/usr/share/livecd-rootfs/update-source-catalog $usc_opts
|
@ -0,0 +1,117 @@
|
|||||||
|
# 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
|
||||||
|
|
||||||
|
# This is the initial network config.
|
||||||
|
# It can be overwritten by cloud-init or subiquity.
|
||||||
|
network:
|
||||||
|
version: 2
|
||||||
|
ethernets:
|
||||||
|
zz-all-en:
|
||||||
|
match:
|
||||||
|
name: "en*"
|
||||||
|
dhcp4: true
|
||||||
|
zz-all-eth:
|
||||||
|
match:
|
||||||
|
name: "eth*"
|
||||||
|
dhcp4: true
|
||||||
|
|
||||||
|
# We used to have a custom final_message here. Just use the default instead.
|
||||||
|
|
||||||
|
# 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
|
||||||
|
- scripts-user
|
||||||
|
- 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,4 @@
|
|||||||
|
output: {all: '>> /var/log/cloud-init-output.log'}
|
||||||
|
no_ssh_fingerprints: true
|
||||||
|
ssh:
|
||||||
|
emit_keys_to_console: false
|
@ -0,0 +1,2 @@
|
|||||||
|
[Journal]
|
||||||
|
RateLimitIntervalSec=0
|
@ -0,0 +1,4 @@
|
|||||||
|
# systemd in 23.04+ uses a newer "compact" format by default which is not
|
||||||
|
# understood by the systemd libraries from jammy used in the subiquity snap.
|
||||||
|
[Service]
|
||||||
|
Environment="SYSTEMD_JOURNAL_COMPACT=0"
|
@ -0,0 +1,4 @@
|
|||||||
|
# systemd in 22.04+ uses "hash table hardening" by default which is not
|
||||||
|
# understood by the systemd libraries from focal used in the subiquity snap.
|
||||||
|
[Service]
|
||||||
|
Environment="SYSTEMD_JOURNAL_KEYED_HASH=0"
|
@ -0,0 +1,3 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
exec sudo snap run subiquity
|
||||||
|
|
@ -0,0 +1,3 @@
|
|||||||
|
[Service]
|
||||||
|
ExecStart=
|
||||||
|
ExecStart=-/sbin/agetty --noclear -n --autologin ubuntu-core-installer %I $TERM
|
@ -0,0 +1 @@
|
|||||||
|
/dev/null
|
@ -0,0 +1 @@
|
|||||||
|
../media-filesystem.mount
|
@ -0,0 +1,8 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Subiquity, the installer for Ubuntu Server %I
|
||||||
|
StartLimitInterval=0
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Environment=SNAP_REEXEC=0
|
||||||
|
ExecStart=
|
||||||
|
ExecStart=/usr/bin/snap run subiquity.subiquity-service %I
|
@ -0,0 +1,4 @@
|
|||||||
|
[Service]
|
||||||
|
StandardOutput=tty
|
||||||
|
ExecStart=
|
||||||
|
ExecStart=/usr/bin/snap run subiquity --ssh
|
@ -0,0 +1,13 @@
|
|||||||
|
[Unit]
|
||||||
|
IgnoreOnIsolate=yes
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Environment=SNAP_REEXEC=0
|
||||||
|
UtmpIdentifier=tty1
|
||||||
|
TTYPath=/dev/tty1
|
||||||
|
TTYReset=yes
|
||||||
|
TTYVHangup=yes
|
||||||
|
TTYVTDisallocate=yes
|
||||||
|
KillMode=process
|
||||||
|
IgnoreSIGPIPE=no
|
||||||
|
SendSIGHUP=yes
|
@ -0,0 +1,2 @@
|
|||||||
|
[Service]
|
||||||
|
Environment=SNAP_REEXEC=0
|
@ -0,0 +1 @@
|
|||||||
|
/bin/true
|
@ -0,0 +1 @@
|
|||||||
|
/lib/systemd/system/systemd-networkd.service
|
@ -0,0 +1 @@
|
|||||||
|
/lib/systemd/system/systemd-networkd-wait-online.service
|
@ -0,0 +1 @@
|
|||||||
|
/lib/systemd/system/systemd-networkd.socket
|
@ -10,9 +10,9 @@ import yaml
|
|||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
parser.add_argument('--output', required=True)
|
parser.add_argument('--output', required=True)
|
||||||
parser.add_argument('--size', required=True)
|
parser.add_argument('--size', required=True)
|
||||||
parser.add_argument('--squashfs', required=True)
|
parser.add_argument('--squashfs', default='')
|
||||||
parser.add_argument('--translations', required=True)
|
parser.add_argument('--translations')
|
||||||
parser.add_argument('--template', required=True)
|
parser.add_argument('--template')
|
||||||
parser.add_argument('--langs', default=None)
|
parser.add_argument('--langs', default=None)
|
||||||
|
|
||||||
opts = parser.parse_args(sys.argv[1:])
|
opts = parser.parse_args(sys.argv[1:])
|
||||||
@ -58,19 +58,20 @@ else:
|
|||||||
template['name'] = {'en': en_name}
|
template['name'] = {'en': en_name}
|
||||||
template['description'] = {'en': en_description}
|
template['description'] = {'en': en_description}
|
||||||
|
|
||||||
for mo in glob.glob(os.path.join(opts.translations, '*.mo')):
|
if opts.translations:
|
||||||
with open(mo, 'rb') as fp:
|
for mo in glob.glob(os.path.join(opts.translations, '*.mo')):
|
||||||
t = gettext.GNUTranslations(fp=fp)
|
with open(mo, 'rb') as fp:
|
||||||
t_name = t.gettext(en_name)
|
t = gettext.GNUTranslations(fp=fp)
|
||||||
if t_name != en_name:
|
t_name = t.gettext(en_name)
|
||||||
lang = os.path.splitext(os.path.basename(mo))[0]
|
if t_name != en_name:
|
||||||
template['name'][lang] = t_name
|
lang = os.path.splitext(os.path.basename(mo))[0]
|
||||||
t_description = t.gettext(en_description)
|
template['name'][lang] = t_name
|
||||||
if t_description != en_description:
|
t_description = t.gettext(en_description)
|
||||||
lang = os.path.splitext(os.path.basedescription(mo))[0]
|
if t_description != en_description:
|
||||||
template['description'][lang] = t_description
|
lang = os.path.splitext(os.path.basedescription(mo))[0]
|
||||||
if opts.langs is not None:
|
template['description'][lang] = t_description
|
||||||
template['preinstalled_langs'] = opts.langs.split(',')
|
if opts.langs is not None:
|
||||||
|
template['preinstalled_langs'] = opts.langs.split(',')
|
||||||
|
|
||||||
output.append(template)
|
output.append(template)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user