Strip device prefix correctly
authorTom Hughes <tom@compton.nu>
Tue, 22 Dec 2015 22:24:37 +0000 (22:24 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 22 Dec 2015 22:24:37 +0000 (22:24 +0000)
cookbooks/hardware/recipes/default.rb

index 2f8a439..c291852 100644 (file)
@@ -300,7 +300,7 @@ end
 disks = node[:hardware][:disk][:disks].map do |disk|
   if disk[:smart_device]
     controller = node[:hardware][:disk][:controllers][disk[:controller]]
-    device = File.basename(controller[:device])
+    device = controller[:device].sub("/dev/", "")
     smart = disk[:smart_device]
 
     if device.start_with?("cciss/") && smart =~ /^cciss,(\d+)$/
@@ -312,7 +312,7 @@ disks = node[:hardware][:disk][:disks].map do |disk|
       munin = "#{device}-#{Regexp.last_match(1)}:#{Regexp.last_match(2)}"
     end
   else
-    device = File.basename(disk[:device])
+    device = disk[:device].sub("/dev/", "")
     munin = device
   end