Skip to content

fix: add shepherd to the list of supported init programs#354

Merged
edouard-lopez merged 2 commits intopure-fish:masterfrom
jbweston:fix/shepherd-init
May 20, 2025
Merged

fix: add shepherd to the list of supported init programs#354
edouard-lopez merged 2 commits intopure-fish:masterfrom
jbweston:fix/shepherd-init

Conversation

@jbweston
Copy link
Contributor

This makes it so that 'username@host' is not spuriously displayed on Guix System when not running in a container.

related: fixes #353

This makes it so that 'username@host' is not spuriously
displayed on Guix System.
@edouard-lopez
Copy link
Member

Thanks for the PR!

Please review the Acceptance Checks.
Could you add a test in tests/_pure_detect_container_by_pid_method.test.fish to cover your case?

@edouard-lopez edouard-lopez added the ⭐️ idea feature request or suggestion label Dec 9, 2024
@jbweston
Copy link
Contributor Author

@edouard-lopez I added a testcase and ran the tests according to your instructions against fish 3.3.1 (the example in the contributing guide) and 3.7.0 (the latest versions available on dockerhub?) and they all passed.

I read through the acceptance checks but most don't seem relevant for this contribution (i.e. this is not a feature with associated configuration variables etc.)

AFAICT I am in compliance with the checks, but let me know what you think!

before_each
@test "_pure_detect_container_by_pid_method: false when detecting shepherd in /proc/1/sched" (
_create_proc_sched_file $proc_sched
echo "shepherd (1, #threads: 1)" >$proc_sched
Copy link
Member

Choose a reason for hiding this comment

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

I'm not familiar with shepherd, but look like that the correct approach .

@edouard-lopez edouard-lopez merged commit d51bcb4 into pure-fish:master May 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

⭐️ idea feature request or suggestion

Projects

None yet

Development

Successfully merging this pull request may close these issues.

user@hostname is displayed on Guix System, even when not in a container

2 participants