Support making raid and Fix problems of partition-tool

Merge the button 'Next' to 'OK' on the network configure interface

	modified:   dialog/di_main.py
	modified:   dialog/di_newt.py
	modified:   interface/ri_data.py
	modified:   interface/ri_oper.py
	modified:   new_partition/interface_partition.py
	modified:   new_partition/partition_data.py

interface/ri_oper.py

@@ -87,6 +87,7 @@ class Operation:
         process.stdin.close()
         while True:
             line = process.stdout.readline()
+            print line
             if not line:
                 break
             if line[0] == '@' and self.current_step < self.steps:
@@ -167,6 +168,9 @@ class Format(Operation):
 		n = 0
 		disks =  p_d.Partition.dict.keys()
 		disks.sort()
+		mds =  ri_data.Raid.dict.keys()
+		mds.sort()
+
 		for d in disks:
 			partitions = p_d.sort_partitions(p_d.Partition.dict, d, 'partition')
 			for p in partitions:
@@ -175,6 +179,13 @@ class Format(Operation):
 				if fmt.strip() == 'yes' and fs_type.strip():
 					format += "%s %s\n" %(p, fs_type)
 					n += 1
+		for m in mds:
+			R = ri_data.Raid.dict[m]
+			fs_type = R.filesystem
+			fmt = R.fmt
+			if fmt.strip() == 'yes' and fs_type.strip():
+				format += "/dev/%s %s\n" %(m, fs_type)
+				n += 1
 
 		self.steps += n
 		return format
@@ -231,6 +242,8 @@ class Mount(Operation):
         n = 0
         disks =  p_d.Partition.dict.keys()
         disks.sort()
+	mds = ri_data.Raid.dict.keys()
+	mds.sort()
         for d in disks:
 			partitions = p_d.sort_partitions(p_d.Partition.dict, d, 'partition')
 			for p in partitions:
@@ -239,6 +252,14 @@ class Mount(Operation):
 				if mp.strip() and fs.strip():
 					mount += "%s %s %s\n" %(p, mp, fs)
 					n += 1
+        for m in mds:
+			R = ri_data.Raid.dict[m]
+			mp = R.mp
+			fs = R.filesystem
+			if mp.strip() and fs.strip():
+				mount += "/dev/%s %s %s\n" %(m, mp, fs)
+				n += 1
+			
         self.steps += n
         return mount
 
@@ -271,6 +292,9 @@ class ConfigureFstab(Mount):
         fstab=''
         disks =  p_d.Partition.dict.keys()
         disks.sort()
+        mds =  ri_data.Raid.dict.keys()
+        mds.sort()
+
         for d in disks:
 			partitions = p_d.sort_partitions(p_d.Partition.dict, d, 'partition')
 			for p in partitions:
@@ -281,6 +305,15 @@ class ConfigureFstab(Mount):
 					mp = 'swap'
 				if mp.strip() and fs.strip():
 					fstab += "%s %s %s\n" %(p, mp, fs)
+        for m in mds:
+			R = ri_data.Raid.dict[m]
+			mp = R.mp
+			fs = R.filesystem
+			if fs.strip() == 'linux-swap':
+				fs = 'swap'
+				mp = 'swap'
+			if mp.strip() and fs.strip():
+				fstab += "/dev/%s %s %s\n" %(m, mp, fs)
 
         # process fstab to sort
         fstab_new = ''