diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index a3d5bd0ed..3d1c9bd9e 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -166,6 +166,7 @@ def makeX86System(mem_mode, mdesc = None, self = None):
     if not mdesc:
         # generic system
         mdesc = SysConfig()
+    mdesc.diskname = 'x86root.img'
     self.readfile = mdesc.script()
 
     # Physical memory
@@ -185,6 +186,13 @@ def makeX86System(mem_mode, mdesc = None, self = None):
 
     self.intrctrl = IntrControl()
 
+    # Disks
+    disk0 = CowIdeDisk(driveID='master')
+    disk2 = CowIdeDisk(driveID='master')
+    disk0.childImage(mdesc.disk())
+    disk2.childImage(disk('linux-bigswap2.img'))
+    self.pc.south_bridge.ide.disks = [disk0, disk2]
+
     # Add in a Bios information structure.
     structures = [X86SMBiosBiosInformation()]
     self.smbios_table.structures = structures