diff options
| author | Paul Rossman <paul@factory9.com> | 2013-08-21 13:29:43 -0500 |
|---|---|---|
| committer | adamedx <adamed@opscode.com> | 2013-10-10 10:45:10 -0700 |
| commit | 498ada58995f5493a6a14903c269b1f3204874a6 (patch) | |
| tree | 4062d166db001d394129cfbc95c4a92772138b05 | |
| parent | 4a6df5ea871e10c3a8bb3320ddbfd21aec6ae2c4 (diff) | |
| download | ohai-498ada58995f5493a6a14903c269b1f3204874a6.tar.gz | |
GCEL is deprecated
| -rw-r--r-- | lib/ohai/plugins/linux/platform.rb | 9 | ||||
| -rw-r--r-- | spec/unit/plugins/linux/platform_spec.rb | 6 |
2 files changed, 3 insertions, 12 deletions
diff --git a/lib/ohai/plugins/linux/platform.rb b/lib/ohai/plugins/linux/platform.rb index a7bb6dd0..2d1b62db 100644 --- a/lib/ohai/plugins/linux/platform.rb +++ b/lib/ohai/plugins/linux/platform.rb @@ -38,14 +38,11 @@ elsif File.exists?("/etc/enterprise-release") platform "oracle" platform_version get_redhatish_version(contents) elsif File.exists?("/etc/debian_version") - # Ubuntu, GCEL and Debian both have /etc/debian_version - # Ubuntu, GCEL should always have a working lsb, debian does not by default + # Ubuntu and Debian both have /etc/debian_version + # Ubuntu should always have a working lsb, debian does not by default if lsb[:id] =~ /Ubuntu/i platform "ubuntu" platform_version lsb[:release] - elsif lsb[:id] =~ /gcel/i - platform "gcel" - platform_version lsb[:release] elsif lsb[:id] =~ /LinuxMint/i platform "linuxmint" platform_version lsb[:release] @@ -99,7 +96,7 @@ end case platform - when /debian/, /ubuntu/, /linuxmint/, /raspbian/, /gcel/ + when /debian/, /ubuntu/, /linuxmint/, /raspbian/ platform_family "debian" when /fedora/ platform_family "fedora" diff --git a/spec/unit/plugins/linux/platform_spec.rb b/spec/unit/plugins/linux/platform_spec.rb index 189b3430..1a194702 100644 --- a/spec/unit/plugins/linux/platform_spec.rb +++ b/spec/unit/plugins/linux/platform_spec.rb @@ -72,12 +72,6 @@ describe Ohai::System, "Linux plugin platform" do @ohai[:platform].should == "linuxmint" @ohai[:platform_family].should == "debian" end - it "should set platform to gcel and platform_family to debian [:lsb][:id] contains GCEL" do - @ohai[:lsb][:id] = "GCEL" - @ohai._require_plugin("linux::platform") - @ohai[:platform].should == "gcel" - @ohai[:platform_family].should == "debian" - end it "should set platform to debian and platform_family to debian [:lsb][:id] contains Debian" do @ohai[:lsb][:id] = "Debian" @ohai._require_plugin("linux::platform") |