Skip to content

Fix virtual resolution on Illumos LX #2772

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.

Sign up for GitHub

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
mhashizume merged 1 commit into from
Nov 1, 2024
Merged

Fix virtual resolution on Illumos LX #2772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/facter/resolvers/containers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ def read_environ(fact_name)
vm = 'podman'
when 'crio'
vm = 'crio'
when 'zone'
return nil
when 'systemd-nspawn'
vm = 'systemd_nspawn'
info = { 'id' => Facter::Util::FileHelper.safe_read('/etc/machine-id', nil).strip }
Expand Down
10 changes: 10 additions & 0 deletions spec/facter/resolvers/containers_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,16 @@
end
end

context 'when hypervisor is illumos' do
let(:cgroup_output) { nil }
let(:environ_output) { ['container=zone'] }

it 'return nil' do
expect(containers_resolver.resolve(:vm)).to eq(nil)
expect(containers_resolver.resolve(:hypervisor)).to eq(nil)
end
end

context 'when hypervisor is neighter lxc nor docker' do
let(:cgroup_output) { load_fixture('cgroup_file').read }
let(:environ_output) { ['PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin'] }
Expand Down
Loading