diff options
| author | Max Martin <max@puppetlabs.com> | 2011-04-28 14:21:43 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-04-28 14:21:43 -0700 |
| commit | 8353506ea5705a58ed4bf91283e475751fb5f77c (patch) | |
| tree | 6b91e1b996d191f04f99881f1ac1a8ecfc38877f | |
| parent | b634a53afa31423c18ca7cb7974391c70a7dd5c7 (diff) | |
| parent | 19f96b59081558eefd613770fdf8c5f5665a150b (diff) | |
| download | facter-8353506ea5705a58ed4bf91283e475751fb5f77c.tar.gz facter-8353506ea5705a58ed4bf91283e475751fb5f77c.tar.xz facter-8353506ea5705a58ed4bf91283e475751fb5f77c.zip | |
Merge branch 'ticket/next/6728-facter_improperly_detects_openvzve_on_cloudlinux_systems' into next
* ticket/next/6728-facter_improperly_detects_openvzve_on_cloudlinux_systems:
(#6728) Facter improperly detects openvzve on CloudLinux systems
(#6883) Update Facter install.rb to be slightly more informative.
| -rw-r--r-- | lib/facter/util/virtual.rb | 2 | ||||
| -rw-r--r-- | spec/unit/util/virtual_spec.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/facter/util/virtual.rb b/lib/facter/util/virtual.rb index 4355451..8bdde16 100644 --- a/lib/facter/util/virtual.rb +++ b/lib/facter/util/virtual.rb @@ -1,6 +1,6 @@ module Facter::Util::Virtual def self.openvz? - FileTest.directory?("/proc/vz") + FileTest.directory?("/proc/vz") and FileTest.exists?( '/proc/vz/veinfo' ) end def self.openvz_type diff --git a/spec/unit/util/virtual_spec.rb b/spec/unit/util/virtual_spec.rb index aa2de5a..36e1bf1 100644 --- a/spec/unit/util/virtual_spec.rb +++ b/spec/unit/util/virtual_spec.rb @@ -9,6 +9,7 @@ describe Facter::Util::Virtual do end it "should detect openvz" do FileTest.stubs(:directory?).with("/proc/vz").returns(true) + FileTest.stubs(:exists?).with("/proc/vz/veinfo").returns(true) Facter::Util::Virtual.should be_openvz end |