-
Notifications
You must be signed in to change notification settings - Fork 53
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
Meulengracht
wants to merge
5
commits into
canonical:ubuntu-24.04
Choose a base branch
from
Meulengracht:slices/finalrd
base: ubuntu-24.04
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
bab6ff0
slices: add finalrd and add bins slice to libc-bin
Meulengracht c48ecc7
slices/finalrd: correct linting issues
Meulengracht 2c9604f
slices/finalrd: additional linting issues
Meulengracht 593c051
slices/libc-bin: fix ordering of essential for bins
Meulengracht 2c4e9f6
Merge branch 'ubuntu-24.04' into slices/finalrd
cjdcordeiro File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
- 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: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,33 @@ essential: | |
- libc-bin_copyright | ||
|
||
slices: | ||
bins: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 andbase-files_bin
for/bin
?There was a problem hiding this comment.
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.