summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Gartrell <jgartrel@quaz.local>2009-03-03 21:35:46 -0800
committerJames Gartrell <jgartrel@quaz.local>2009-03-03 21:35:46 -0800
commit234d574e2d8a1e78b68b9d026807c68efa8228bd (patch)
treec061fcf39950970286b9989f5861fbfdaf407281
parent4483b8ecaf383e23639046834a83c003094ff225 (diff)
downloadohai-234d574e2d8a1e78b68b9d026807c68efa8228bd.tar.gz
Added comments to clarify the choice of "windows" as the platform and OS for Windows_NT family
-rw-r--r--lib/ohai/plugins/os.rb6
-rw-r--r--lib/ohai/plugins/windows/platform.rb1
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/ohai/plugins/os.rb b/lib/ohai/plugins/os.rb
index f8acf56a..b133062d 100644
--- a/lib/ohai/plugins/os.rb
+++ b/lib/ohai/plugins/os.rb
@@ -27,7 +27,11 @@ when /linux/
when /freebsd(.+)$/
os "freebsd"
when /mswin/
- # See notes in windows::platform.rb
+ # After long discussion in IRC the "powers that be" have come to a concensus
+ # that there is no other Windows platforms exist that were not based on the
+ # Windows_NT kernel, so we herby decree that "windows" will refer to all
+ # platforms built upon the Windows_NT kernel and have access to win32 or win64
+ # subsystems.
os "windows"
else
os languages[:ruby][:host_os]
diff --git a/lib/ohai/plugins/windows/platform.rb b/lib/ohai/plugins/windows/platform.rb
index 8492de74..c40675aa 100644
--- a/lib/ohai/plugins/windows/platform.rb
+++ b/lib/ohai/plugins/windows/platform.rb
@@ -21,7 +21,6 @@
# Windows_NT kernel, so we herby decree that "windows" will refer to all
# platforms built upon the Windows_NT kernel and have access to win32 or win64
# subsystems.
-
platform os
platform_version kernel['release']