Correctly detect if systemd is used in Debian #488
Closed
Conversation
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
CFEngine 3.6 tries to understand if a Linux is using systemd as init system by looking at the contents of /proc/1/cmdline, that happens in bundle common inventory_linux. That's indeed a smart thing to do but unfortunately fails on Debian Jessie, where you have: root@cf-test-v10:~# ls -l /sbin/init lrwxrwxrwx 1 root root 20 May 26 06:07 /sbin/init -> /lib/systemd/systemd the pseudo-file in /proc will still report /sbin/init and as a result the systemd class won't be set. This affects services promises negatively This patch checks if /sbin/init is a link; if it is, and it points to systemd, the systemd class is set
|
Can one of the admins verify this patch? |
| @@ -82,6 +87,12 @@ bundle common inventory_debian | |||
| comment => "derived from Debian", | |||
| meta => { "inventory", "attribute_name=none" }; | |||
|
|
|||
| init_is_link:: | |||
| "systemd" | |||
| expression => regcmp("/lib/systemd/systemd", | |||
There was a problem hiding this comment.
Perhaps this should be .*/systemd$ instead, to catch all possible paths where systemd might be installed?
|
+1! Note that the same thing exists in C code (https://github.com/cfengine/core/blob/master/libenv/sysinfo.c#L993-L1012). |
|
See also cfengine/core#2249. |
|
No problem in matching the final part of the path. Currently it's /lib/systemd/systemd in jessie but a pattern matching is probably more future-proof. |
|
In fact I don't think this is necessary anymore after cfengine/core#2252. Closing this to avoid having the detection in two places. Thanks for the Proof of Concept though! :-) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
CFEngine 3.6 tries to understand if a Linux is using systemd as init system
by looking at the contents of /proc/1/cmdline, that happens in
bundle common inventory_linux. That's indeed a smart thing to do but unfortunately
fails on Debian Jessie, where you have:
root@cf-test-v10:~# ls -l /sbin/init
lrwxrwxrwx 1 root root 20 May 26 06:07 /sbin/init -> /lib/systemd/systemd
the pseudo-file in /proc will still report /sbin/init and as a result the systemd
class won't be set. This affects services promises negatively
This patch checks if /sbin/init is a link; if it is, and it points to systemd,
the systemd class is set