Merge pull request jhoblitt#1 from ucam-cl-dtg/master

Test for megaraid device symbols being :undefined in smartd.conf template
samuraiii · May 15, 2013 · 56c987b · 56c987b
2 parents 9982990 + 3463290
commit 56c987b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/templates/smartd.conf b/templates/smartd.conf
@@ -9,8 +9,8 @@ DEFAULT -m <%= @mail_to %> -M <%= @warning_schedule %>
 <% megaraid_adapters = scope.lookupvar('::megaraid_adapters')
 megaraid_device = scope.lookupvar('::megaraid_virtual_drives')
 megaraid_drives = scope.lookupvar('::megaraid_physical_drives')
-megaraid_device = megaraid_device.split(/,/)[0]
-megaraid_drives = megaraid_drives.nil? ? [] : megaraid_drives.split(/,/)
+megaraid_device = megaraid_device == :undefined ? "" : megaraid_device.split(/,/)[0]
+megaraid_drives = megaraid_drives == :undefined ? [] : megaraid_drives.split(/,/)
 
 if megaraid_device and megaraid_device != '' and
      megaraid_adapters and megaraid_adapters.to_i > 0 -%>