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

bin/ubuntu-core-initramfs: include dbus files for org.freedesktop.systemd1 #237

Merged

Conversation

alfonsosanchezbeato
Copy link
Member

These were pulled in on uc22, get them back as they are needed by systemd-run when used from snap-bootstrap.

Copy link
Member

@andrewphelpsj andrewphelpsj left a comment

Choose a reason for hiding this comment

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

Thank you!

Copy link
Collaborator

@valentindavid valentindavid left a comment

Choose a reason for hiding this comment

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

Looks good.

@@ -326,6 +326,7 @@ def install_systemd_files(dest_dir, sysroot):
# * Configuration for systemd-tmpfiles
# TODO: some of this can be cleaned up
to_include = re.compile(r"^(/usr)?/lib/systemd/system|"
r"/usr/share/dbus-1/.*/org.freedesktop.systemd1\..*|"
Copy link
Collaborator

Choose a reason for hiding this comment

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

It seems we are copying services/org.freedesktop.systemd1.service, but this is for user session and is useless in initramfs. It is system-services/org.freedesktop.systemd1.service that is used. Otherwise it looks fine.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good point, I've stopped copying that one

…temd1

These were pulled in on uc22, get them back as they are needed by
systemd-run when used from snap-bootstrap.
@alfonsosanchezbeato alfonsosanchezbeato merged commit 10b19cb into canonical:main Mar 13, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants