wiz update, nfs fixed

2 files changed, 61 insertions, 34 deletions

diff --git a/nfs_wizard/nfs.wiz b/nfs_wizard/nfs.wiz
index 4373259c..a2c232e2 100644
--- a/nfs_wizard/nfs.wiz
+++ b/nfs_wizard/nfs.wiz
@@ -9,6 +9,7 @@
 	defaultImage="__WIZ_HOME__/nfs_wizard/images/NFS"
 	perlModule="__WIZ_HOME__/nfs_wizard/scripts/NFSConf.pm"
 	rpm="nfs-utils"
+	summaryFunc="do_it"
 >
 
 	<Variable
@@ -138,7 +139,7 @@
 	>
 
 		<Target
-			targetName="congratulations"
+			targetName="doit"
 			jumpIndex="1"
 		>
 		</Target>
@@ -168,7 +169,6 @@
 		<Chooser
 			name="chooser1"
 			variableName="wiz_nfs_level"
-			helpFontName="Default"
 		>
 
 			<Option
@@ -186,11 +186,11 @@
 	</Page>
 	<Page
 		name="shownet"
-		func="do_it"
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-proxy.html"
-		jumpPage="congratulations"
+		jumpPage="doit"
 		executionLevel="NORMAL"
 		nextFinish="false"
+		is="wiz_nfs_level=2"
 		canBack="true"
 		canCancel="true"
 	>
@@ -217,6 +217,59 @@
 	</Page>
 
 	<Page
+		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
+		name="doit"
+		func="do_it"
+		nextButtonText="Configure"
+		executionLevel="NORMAL"
+		nextFinish="false"
+		canBack="true"
+		canCancel="true"
+	>
+		<Target
+			targetName="catastrophic_exit"
+			jumpIndex="2"
+		>
+		</Target>
+
+		<Target
+			targetName="congratulations"
+			jumpIndex="10"
+		>
+		</Target>
+
+		<Info
+			helpText="The wizard collected the following parameters."
+		>
+		</Info>
+
+		<Freetext
+			name="freetext"
+			variableName="varwiz_nfs_dir"
+			helpText="Exported dir:"
+			editable="false"
+		>
+		</Freetext>
+
+		<Freetext
+			name="freetext"
+			variableName="wiz_nfs_level"
+			helpText="Access :"
+			editable="false"
+		>
+		</Freetext>
+
+		<Freetext
+			name="freetext1"
+			variableName="wiz_netmask"
+			helpText="Netmask :"
+			editable="false"
+		>
+		</Freetext>
+
+	</Page>
+
+	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-nfs.html"
 		name="congratulations"
 		nextButtonText="Quit"
@@ -227,34 +280,11 @@
 	>
 
 		<Info
-			name="info23"
-			alignement="Center"
 			helpText="Congratulations"
-			guiType="label"
-			fontName="Default"
-			fontStyle="bold"
-			fontSize="14"
 		>
 		</Info>
-
 		<Info
-			name="info20"
-			alignement="Center"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
-		>
-		</Info>
-
-		<Info
-			name="info24"
-			alignement="Center"
 			helpText="The wizard successfully configured your NFS Server"
-			guiType="label"
-			fontName="Default"
-			fontStyle="plain"
-			fontSize="11"
 		>
 		</Info>
 	</Page>
diff --git a/nfs_wizard/scripts/NFSConf.pm b/nfs_wizard/scripts/NFSConf.pm
index 673f571a..10387805 100644
--- a/nfs_wizard/scripts/NFSConf.pm
+++ b/nfs_wizard/scripts/NFSConf.pm
@@ -17,9 +17,6 @@ sub	network_mask {
 }
 
 sub	chooser {
-    if ($ENV{wiz_nfs_level} == 1) {
-	do_it();
-    }
     $ENV{wiz_nfs_level};
 }
 
@@ -35,15 +32,15 @@ sub	do_it {
     else {
 	$line = "$ENV{wiz_nfs_dir} *(rw,no_root_squash)\n";
     }
-    print "$line\n";
     my $t;
     foreach (cat_($file)) {
-	if (/.*(?!\#).*$ENV{wiz_nfs_dir}\s.*/) {
+	if (/^(?!\#).*$ENV{wiz_nfs_dir}\s.*/) {
 	    $t = $_;
 	    last;
 	}
     }
-    if ($t) {substInFile { s|.*(?!\#).*$ENV{wiz_nfs_dir}\s.*|\#$&|} $file }
+    substInFile { s|^(?!\#).*$ENV{wiz_nfs_dir}\s.*|\#$&|} $file;
     append_to_file($file, $line);
-    system("/usr/sbin/exportfs -a")
+    system("/usr/sbin/exportfs -a");
+    10;
 }