summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@opscode.com>2012-10-29 23:38:25 -0700
committerLamont Granquist <lamont@opscode.com>2012-10-29 23:38:25 -0700
commitf9a5411e10eda773b92a1b57e7ca1522893ef792 (patch)
tree4e173594dc012759d37b87c29e9bbcc7ed1d0929
parent3967b5a3fd619dc392b8bf5dd2554d822a8fd400 (diff)
downloadohai-f9a5411e10eda773b92a1b57e7ca1522893ef792.tar.gz
adding raspbian as a distinct platform in the debian family
-rw-r--r--lib/ohai/plugins/linux/platform.rb8
-rw-r--r--spec/ohai/plugins/linux/platform_spec.rb10
2 files changed, 16 insertions, 2 deletions
diff --git a/lib/ohai/plugins/linux/platform.rb b/lib/ohai/plugins/linux/platform.rb
index 4317738d..45810b8b 100644
--- a/lib/ohai/plugins/linux/platform.rb
+++ b/lib/ohai/plugins/linux/platform.rb
@@ -44,7 +44,11 @@ elsif File.exists?("/etc/debian_version")
platform "ubuntu"
platform_version lsb[:release]
else
- platform "debian"
+ if File.exists?("/usr/bin/raspi-config")
+ platform "raspbian"
+ else
+ platform "debian"
+ end
platform_version File.read("/etc/debian_version").chomp
end
elsif File.exists?("/etc/redhat-release")
@@ -85,7 +89,7 @@ end
case platform
- when /debian/, /ubuntu/, /linuxmint/
+ when /debian/, /ubuntu/, /linuxmint/, /raspbian/
platform_family "debian"
when /fedora/
platform_family "fedora"
diff --git a/spec/ohai/plugins/linux/platform_spec.rb b/spec/ohai/plugins/linux/platform_spec.rb
index e444fa0d..7bc274ba 100644
--- a/spec/ohai/plugins/linux/platform_spec.rb
+++ b/spec/ohai/plugins/linux/platform_spec.rb
@@ -36,6 +36,7 @@ describe Ohai::System, "Linux plugin platform" do
File.stub!(:exists?).with("/etc/slackware-version").and_return(false)
File.stub!(:exists?).with("/etc/enterprise-release").and_return(false)
File.stub!(:exists?).with("/etc/oracle-release").and_return(false)
+ File.stub!(:exists?).with("/usr/bin/raspi-config").and_return(false)
end
it "should require the lsb plugin" do
@@ -130,6 +131,15 @@ describe Ohai::System, "Linux plugin platform" do
@ohai._require_plugin("linux::platform")
@ohai[:platform].should == "ubuntu"
end
+
+ # Raspbian is a debian clone
+ it "should detect Raspbian as itself with debian as the family" do
+ File.should_receive(:exists?).with("/usr/bin/raspi-config").and_return(true)
+ File.should_receive(:read).with("/etc/debian_version").and_return("wheezy/sid")
+ @ohai._require_plugin("linux::platform")
+ @ohai[:platform].should == "raspbian"
+ @ohai[:platform_family].should == "debian"
+ end
end
describe "on slackware" do