Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(24.04): add finalrd and add bins slice to libc-bin #342

Open
wants to merge 5 commits into
base: ubuntu-24.04
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions slices/finalrd.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package: finalrd

essential:
- finalrd_copyright

slices:
# finalrd is a shell script that relies on a couple of packages to even
# work correctly: libc-bin, systemd, mount, grep and coreutils.
# If initramfs-tools is supplied (which is optional), it also needs
# findutils and debianutils. so rely on atleast the first set of binaries.
bins:
essential:
- coreutils_bins

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is a shell script should we add dash_bins for the shell and base-files_bin for /bin?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you probably don't need the entire coreutils, so I suggest creating a new coreutils slice(s) with just the bins you need for this.

- finalrd_config
- grep_bins
- libc-bin_bins
- mount_bins
- systemd_bins
contents:
/usr/bin/finalrd:

config:
contents:
/usr/lib/finalrd/finalrd-static.conf:
/usr/share/finalrd/:

services:
contents:
/lib/systemd/system/finalrd.service:

copyright:
contents:
/usr/share/doc/finalrd/copyright:
27 changes: 27 additions & 0 deletions slices/libc-bin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,33 @@ essential:
- libc-bin_copyright

slices:
bins:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need tests for this

essential:
- libc-bin_config
- libc6_libs
contents:
/usr/bin/getconf:
/usr/bin/getent:
/usr/bin/iconv:
/usr/bin/ld.so:
/usr/bin/ldd:
/usr/bin/locale:
/usr/bin/localedef:
/usr/bin/pldd:
/usr/bin/tzselect:
/usr/bin/zdump:
/usr/sbin/iconvconfig:
/usr/sbin/ldconfig:
/usr/sbin/ldconfig.real:
/usr/sbin/zic:

config:
contents:
/etc/bindresvport.blacklist:
/etc/gai.conf:
/etc/ld.so.conf:
/etc/ld.so.conf.d/libc.conf:

nsswitch:
contents:
/etc/nsswitch.conf: {copy: /usr/share/libc-bin/nsswitch.conf}
Expand Down
13 changes: 13 additions & 0 deletions tests/spread/integration/finalrd/task.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
summary: Integration tests for finalrd

execute: |
# Chisel a minimum number of slices to give us a runnable system that we can
# test in.
rootfs="$(install-slices bash_bins base-files_base finalrd_bins)"

# the script need /bin/sh
chroot "${rootfs}" ln -s /usr/bin/bash /bin/sh

# try to execute the script, it will fail as it will hit
# an apparmor denial in remounting /run as rw,exec
chroot "${rootfs}" finalrd 2>&1 | grep "cannot remount"
Loading