-
Notifications
You must be signed in to change notification settings - Fork 580
Determine root_home without shelling out #1278
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
Merged
Merged
Changes from all commits
Commits
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 hidden or 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 |
|---|---|---|
| @@ -1,49 +1,11 @@ | ||
| # frozen_string_literal: true | ||
|
|
||
| # root_home.rb | ||
| module Facter::Util::RootHome | ||
| # @summary | ||
| # A facter fact to determine the root home directory. | ||
| # This varies on PE supported platforms and may be | ||
| # reconfigured by the end user. | ||
| class << self | ||
| # determines the root home directory | ||
| def returnt_root_home | ||
| root_ent = Facter::Core::Execution.execute('getent passwd root') | ||
| # The home directory is the sixth element in the passwd entry | ||
| # If the platform doesn't have getent, root_ent will be nil and we should | ||
| # return it straight away. | ||
| root_ent && root_ent.split(':')[5] | ||
| end | ||
| end | ||
| end | ||
|
|
||
| Facter.add(:root_home) do | ||
| setcode { Facter::Util::RootHome.returnt_root_home } | ||
| end | ||
|
|
||
| Facter.add(:root_home) do | ||
| confine kernel: :darwin | ||
| setcode do | ||
| str = Facter::Core::Execution.execute('dscacheutil -q user -a name root') | ||
| hash = {} | ||
| str.split("\n").each do |pair| | ||
| key, value = pair.split(%r{:}) | ||
| hash[key] = value | ||
| end | ||
| hash['dir'].strip | ||
| end | ||
| end | ||
|
|
||
| Facter.add(:root_home) do | ||
| confine kernel: :aix | ||
| root_home = nil | ||
| setcode do | ||
| str = Facter::Core::Execution.execute('lsuser -c -a home root') | ||
| str&.split("\n")&.each do |line| | ||
| next if %r{^#}.match?(line) | ||
| root_home = line.split(%r{:})[1] | ||
| end | ||
| root_home | ||
| require 'etc' | ||
| rescue LoadError | ||
| # Unavailable on platforms like Windows | ||
| else | ||
| Etc.getpwnam('root').dir | ||
| end | ||
| end | ||
This file contains hidden or 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
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.
Nice removal of code @ekohl.
What do you think about confining the fact to osx and linux? I noticed the test just checks for
nilwhen:kernelis Windows.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.
Today there's also fact for AIX and I'd expect this code to work on any unix (like Solaris). However, I can't test that since I don't have access to those systems. Any you could confine it to non-Windows but I think this is effectively the same.
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.
Fair point!