From 40dab914b7b92e75dd6297ab31c86bea033e8fa9 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@localhost>
Date: Fri, 22 Apr 2011 00:50:41 +0000
Subject: inst: installer adaption to cwfs

---
 rc/bin/inst/prepdisk | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'rc/bin/inst/prepdisk')

diff --git a/rc/bin/inst/prepdisk b/rc/bin/inst/prepdisk
index a1faf0fe6..359b93621 100755
--- a/rc/bin/inst/prepdisk
+++ b/rc/bin/inst/prepdisk
@@ -4,8 +4,10 @@
 # prereq: partdisk
 
 fn autotype {
-	if(~ $fstype cwfs)
+	switch($fstype){
+	case cwfs cwfs64 cwfs64x
 		echo -a 9fat -a nvram -a fscache -a fsworm -a other
+	}
 }
 
 switch($1) {
@@ -41,16 +43,7 @@ case go
 case checkdone
 	if(! test -f /dev/sd*/9fat)
 		prepdisk=ready
-
-	if(! ~ $prepdisk ready){
+	if(! ~ $prepdisk ready)
 		prepdisk=done
-		switch($fstype){
-		case cwfs
-			if(! test -f /dev/sd*/fscache* && ! test -f /dev/fs/fscache*)
-				prepdisk=ready
-			if(! test -f /dev/sd*/fsworm* && ! test -f /dev/fs/fsworm*)
-				prepdisk=ready
-		}
-	}
 	export prepdisk
 }
-- 
cgit v1.2.3