diff --git a/library/setup b/library/setup
index 89231a1b224..1a685ef0307 100755
--- a/library/setup
+++ b/library/setup
@@ -58,6 +58,7 @@ class Facts(object):
         self.facts = {}
         self.get_platform_facts()
         self.get_distribution_facts()
+        self.get_cmdline()
         self.get_public_ssh_host_keys()
         self.get_selinux_facts()
 
@@ -103,6 +104,17 @@ class Facts(object):
                 else:
                     self.facts['distribution'] = name
 
+    def get_cmdline(self):
+        data = get_file_content('/proc/cmdline')
+        if data:
+            self.facts['cmdline'] = {}
+            for piece in shlex.split(data):
+                item = piece.split('=', 1)
+                if len(item) == 1:
+                    self.facts['cmdline'][item[0]] = True
+                else:
+                    self.facts['cmdline'][item[0]] = item[1]
+
     def get_public_ssh_host_keys(self):
         dsa = get_file_content('/etc/ssh/ssh_host_dsa_key.pub')
         rsa = get_file_content('/etc/ssh/ssh_host_rsa_key.pub')
@@ -198,7 +210,7 @@ class LinuxHardware(Hardware):
     MEMORY_FACTS = ['MemTotal', 'SwapTotal', 'MemFree', 'SwapFree']
     # DMI bits
     DMI_DICT = dict(
-        form_factor     =  '/sys/devices/virtual/dmi/id/chassis_type',
+        form_factor     = '/sys/devices/virtual/dmi/id/chassis_type',
         product_name    = '/sys/devices/virtual/dmi/id/product_name',
         product_serial  = '/sys/devices/virtual/dmi/id/product_serial',
         product_uuid    = '/sys/devices/virtual/dmi/id/product_uuid',