Raid works!!!

3 files changed, 7 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 81f1b4a19..c517f58e0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,8 @@ ARCH := $(patsubst i%86,i386,$(shell uname -m))
 ARCH := $(patsubst sparc%,sparc,$(ARCH))
 
 SUBDIRSHD = rpmmodule isys balkan libfdisk collage loader stubs po kudzu \
-	    minislang
-SUBDIRS = $(SUBDIRSHD) gnome-map iw textw help pixmaps
+	    minislang textw
+SUBDIRS = $(SUBDIRSHD) gnome-map iw help pixmaps
 BUILDONLYSUBDIRS = pump
 
 ifeq (i386, $(ARCH))
diff --git a/anaconda b/anaconda
index 8c346877a..f7751b423 100755
--- a/anaconda
+++ b/anaconda
@@ -99,8 +99,9 @@ import isys
 from installclass import CustomInstall
 from kickstart import Kickstart
 
-if (iutil.memInstalled() < 30000):
-    mode = 't'
+if (not test):
+    if (iutil.memInstalled() < 30000):
+	mode = 't'
 
 if (mode == 'g' and not os.environ.has_key('DISPLAY')):
     import xserver
diff --git a/todo.py b/todo.py
index b7da0508d..eafe90a19 100644
--- a/todo.py
+++ b/todo.py
@@ -459,7 +459,7 @@ class ToDo:
 		isys.makeDevInode(device, '/tmp/' + device)
 
 		rt.write("raiddev		    /tmp/%s\n" % (device,))
-		rt.write("raid-level		    %d\n % (raidType,)")
+		rt.write("raid-level		    %d\n" % (raidType,))
 		rt.write("nr-raid-disks		    %d\n" % (len(makeup),))
 		rt.write("chunk-size		    64k\n")
 		rt.write("persistent-superblock	    1\n");
@@ -479,7 +479,7 @@ class ToDo:
 	    w = self.intf.waitWindow(_("Creating"),
 			  _("Creating RAID devices..."))
 
-	    for (mntpoint, device, makeup) in raid:
+	    for (mntpoint, device, raidType, makeup) in raid:
                 iutil.execWithRedirect ("/usr/sbin/mkraid", 
 			[ 'mkraid', '--really-force', '--configfile', 
 			  '/tmp/raidtab', '/tmp/' + device ])