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

[init.container] Detect host OS reliably. JB#59670 #349

Merged
merged 1 commit into from Jan 12, 2023
Merged

Conversation

martyone
Copy link
Member

No description provided.

The /dev tree is now bind-mounted on Linux, so the test for /dev/fuse
presence would be true there in most cases too.
Copy link
Member

@vigejolla vigejolla left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -32,6 +32,15 @@ set -o nounset
LOG=/var/log/systemboot.log
NOTE="Autogenerated by $0. Do not edit!"

# Backward compatibility with older sfdk - to be dropped later
if [[ ! ${SAILFISH_SDK_HOST_OS:-} ]]; then
if [[ -e /dev/fuse ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

/dev/fuse also exists in Linux. Does docker reveal the target plat form in a another way?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, on Linux the default content of /dev is different under Docker. This changes now with the related PR under qtc where we bind mount /dev from host.

@martyone martyone merged commit e444eb4 into master Jan 12, 2023
@martyone martyone deleted the jb59670 branch January 12, 2023 12:20
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.

None yet

3 participants