X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fdebian-org%2Flib%2Ffacter%2Fsystem-hw.rb;h=0b36e5feb844f0bb3d3dcf83b53bd7f525971d4a;hb=6326fbc9ca5caff07ba662c331922205b3a77716;hp=1a154f67767933fd757f51a8efd04d194a59e833;hpb=e64b83b40f399a11a097a7d27489909823db3a0e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/lib/facter/system-hw.rb b/modules/debian-org/lib/facter/system-hw.rb
index 1a154f677..0b36e5feb 100644
--- a/modules/debian-org/lib/facter/system-hw.rb
+++ b/modules/debian-org/lib/facter/system-hw.rb
@@ -1,6 +1,21 @@
-Facter.add("system-product-name") do
+Facter.add("systemproductname") do
 	confine :kernel => :linux
 	setcode do
-		%x{dmidecode -s system-product-name}.chomp
+		if FileTest.exist?("/usr/sbin/dmidecode")
+			%x{/usr/sbin/dmidecode -s system-product-name}.chomp.strip
+		else
+			''
+		end
+	end
+end
+
+Facter.add("hw_can_temp_sensors") do
+	confine :kernel => :linux
+	setcode do
+		if FileTest.exist?("/sys/devices/virtual/thermal/thermal_zone0/temp")
+			true
+		else
+			''
+		end
 	end
 end