diff -pruN /home/harsha/gluster-work/current-rc3/gluster--mainline--1.0--patch-93/extensions/GlusterEP/GCapture GlusterEP/GCapture
--- /home/harsha/gluster-work/current-rc3/gluster--mainline--1.0--patch-93/extensions/GlusterEP/GCapture	2006-08-04 12:39:07.000000000 -0700
+++ GlusterEP/GCapture	2006-08-10 10:24:34.000000000 -0700
@@ -30,7 +30,7 @@ my_ip = os.popen ("ifconfig -a | sed -n 
 port_base = 13370
 
 def source_config ():
-    if os.system ('gprobe | gpart-sel -o /tmp/gc.spec -m /tmp/gc_approx_max -c /tmp/gc.tar.cmds') == 0:
+    if os.system ('gprobe | gpart-sel -o /tmp/gc.xml -m /tmp/gc_approx_max -c /tmp/gc.tar.cmds') == 0:
         return
     else:
         sys.exit (1)
@@ -39,16 +39,18 @@ def source_config ():
 def dest_config ():
     os.system ('ssh master-node mkdir -p /var/tmp/%s' % my_ip)
     os.system ('scp /tmp/gc.spec master-node:/var/tmp/%s' % my_ip)
-    if os.system ("ssh -t master-node 'gimage-dump -s /var/tmp/%s/gc.spec -o /var/tmp/%s/cookie'" % (my_ip, my_ip)) != 0:
+    if os.system ("ssh -t master-node 'gimage-dump -s /var/tmp/%s/gc.xml -o /var/tmp/%s/cookie'" % (my_ip, my_ip)) != 0:
         sys.exit (1)
         return
     return
 
 def source_action ():
-    partlist = gdump_partlist (read_gdump (file ('/tmp/gc.spec')))
+    partlist = gdump_partlist (read_xml_to_gdump (file ('/tmp/gc.xml')))
     parts = partlist.keys ()
     parts = filter ((lambda x:
-                     partlist[x]['FS'] != 'linux-swap' and partlist[x]['XFER'] == 'Y'),
+                     partlist[x]['FS'] != 'linux-swap' \
+		     and partlist[x].has_key ('XFER') \
+		     and partlist[x]['XFER'] == 'Y'),
                     parts)
     parts.sort ()
     no_parts = len (parts)
diff -pruN /home/harsha/gluster-work/current-rc3/gluster--mainline--1.0--patch-93/extensions/GlusterEP/GlusterEP GlusterEP/GlusterEP
--- /home/harsha/gluster-work/current-rc3/gluster--mainline--1.0--patch-93/extensions/GlusterEP/GlusterEP	2006-08-04 12:39:07.000000000 -0700
+++ GlusterEP/GlusterEP	2006-08-08 18:41:49.000000000 -0700
@@ -101,7 +101,6 @@ def image_management ():
     return
 
 def config_client ():
-    os.system ("rm /var/gluster/EP/bootp.iface -f")
     os.system ("/etc/stage2/config_network.sh")
     os.system ("gdump-netstate /var/gluster/EP/rc.local")
     os.system ("chmod +x /var/gluster/EP/rc.local")
@@ -144,12 +143,7 @@ def master ():
         os.system ("/var/gluster/EP/rc.local")
     
     # GExtension.run ('client-reg')
-    while True:
-        if GExtension.run ('bootp-manager', '--allow 2>>/var/log/proglog') != 1:
-            break
-        os.system ("/etc/stage2/config_network.sh")
-        os.system ("gdump-netstate /var/gluster/EP/rc.local")
-        os.system ("chmod +x /var/gluster/EP/rc.local")
+    GExtension.run ('bootp-manager', '--allow 2>>/var/log/proglog')
 
     first_time = True
     while ('<no users>', '') in get_usernames ():
diff -pruN /home/harsha/gluster-work/current-rc3/gluster--mainline--1.0--patch-93/extensions/GlusterEP/GProvision GlusterEP/GProvision
--- /home/harsha/gluster-work/current-rc3/gluster--mainline--1.0--patch-93/extensions/GlusterEP/GProvision	2006-08-04 12:39:07.000000000 -0700
+++ GlusterEP/GProvision	2006-08-11 18:07:50.000000000 -0700
@@ -37,9 +37,9 @@ def source_config ():
     cookie = os.popen ('ssh master-node cat /var/tmp/%s/cookie' % my_ip).readline ().strip ()
     if not cookie:
         return None
-    spec_fd = os.popen ('ssh master-node cat system-images/%s/provision.spec'
+    spec_fd = os.popen ('ssh master-node cat system-images/%s/provision.xml'
                         % cookie)
-    partlist = gdump_partlist (read_gdump (spec_fd))
+    partlist = gdump_partlist (read_xml_to_gdump (spec_fd))
     spec_fd.close ()
 
     return partlist
@@ -48,7 +48,9 @@ def source_action (partlist):
     global cookie
     parts = partlist.keys ()
     parts = filter ((lambda x:
-                     partlist[x]['FS'] != 'linux-swap' and partlist[x]['XFER'] == 'Y'),
+                     partlist[x]['FS'] != 'linux-swap' \
+		     and partlist[x].has_key ('XFER') \
+		     and partlist[x]['XFER'] == 'Y'),
                     parts)
     parts.sort ()
     no_parts = len (parts)
@@ -68,14 +70,16 @@ def source_action (partlist):
     return
 
 def dest_config (partlist):
-    spec_fd = file ('/tmp/provision.spec', "w")
-    write_dump (spec_fd, partlist_gdump (partlist))
+    spec_fd = file ('/tmp/provision.xml', "w")
+    write_gdump_to_xml (spec_fd, partlist_gdump (partlist))
     spec_fd.flush ()
     spec_fd.close ()
 
     parts = partlist.keys ()
     parts = filter ((lambda x:
-                     partlist[x]['FS'] != 'linux-swap' and partlist[x]['XFER'] == 'Y'),
+                     partlist[x]['FS'] != 'linux-swap' \
+		     and partlist[x].has_key ('XFER') \
+		     and partlist[x]['XFER'] == 'Y'),
                     parts)
     parts.sort ()
     no_parts = len (parts)
@@ -90,12 +94,12 @@ def dest_config (partlist):
                   title='[ Partition Assignment ]',
                   yes_label='Auto',
                   no_label='Manual'):
-        if os.system ('gmeta-installer -i /tmp/provision.spec -c /tmp/gprov.dest.cmds') == 0:
+        if os.system ('gmeta-installer -i /tmp/provision.xml -c /tmp/gprov.dest.cmds') == 0:
             return
         else:
             sys.exit (0)
     else:
-        os.system ('gmeta-installer --auto -i /tmp/provision.spec -c /tmp/gprov.dest.cmds')
+        os.system ('gmeta-installer --auto -i /tmp/provision.xml -c /tmp/gprov.dest.cmds')
     return
 
 def gprov_action (spec):