From 85c838c835bdaa56f7444b2e9ea0e55565153fbc Mon Sep 17 00:00:00 2001 From: Stephen Fromm Date: Thu, 2 Aug 2012 07:22:51 -0700 Subject: [PATCH] Add Blade to FORM_FACTOR list and document SMBIOS spec URL --- library/setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/setup b/library/setup index f932565bac..19497f9b20 100755 --- a/library/setup +++ b/library/setup @@ -189,6 +189,7 @@ class LinuxHardware(Hardware): 'bios_date': '/sys/devices/virtual/dmi/id/bios_date', 'bios_version': '/sys/devices/virtual/dmi/id/bios_version' } # From smolt and DMI spec + # See http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_2.7.0.pdf FORM_FACTOR = [ "Unknown", "Other", "Unknown", "Desktop", "Low Profile Desktop", "Pizza Box", "Mini Tower", "Tower", "Portable", "Laptop", "Notebook", "Hand Held", "Docking Station", @@ -196,7 +197,7 @@ class LinuxHardware(Hardware): "Main Server Chassis", "Expansion Chassis", "Sub Chassis", "Bus Expansion Chassis", "Peripheral Chassis", "RAID Chassis", "Rack Mount Chassis", "Sealed-case PC", "Multi-system", - "CompactPCI", "AdvancedTCA" ] + "CompactPCI", "AdvancedTCA", "Blade" ] def __init__(self): Hardware.__init__(self) @@ -250,7 +251,6 @@ class LinuxHardware(Hardware): data = get_file_content(path) if data is not None: if key == 'form_factor': - try: self.facts['form_factor'] = LinuxHardware.FORM_FACTOR[int(data)] except IndexError, e: