One small policy tweak to something I like better.

3 files changed, 8 insertions, 6 deletions

diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 263a04d..bf3ac84 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.47 1996/08/03 10:10:40 jkh Exp $
+ * $Id: config.c,v 1.48 1996/10/02 10:32:28 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -630,7 +630,7 @@ configNovell(dialogMenuItem *self)
 {
     int ret = DITEM_SUCCESS;
 
-    if (!RunningAsRoot) {
+    if (!RunningAsInit) {
 	msgConfirm("This package can only be installed in multi-user mode.");
 	return ret;
     }
diff --git a/release/sysinstall/ftp_strat.c b/release/sysinstall/ftp_strat.c
index a2f4351..212593f 100644
--- a/release/sysinstall/ftp_strat.c
+++ b/release/sysinstall/ftp_strat.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated to essentially a complete rewrite.
  *
- * $Id: ftp_strat.c,v 1.26 1996/10/02 02:28:21 jkh Exp $
+ * $Id: ftp_strat.c,v 1.27 1996/10/02 08:25:05 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -72,7 +72,7 @@ mediaInitFTP(Device *dev)
 try:
     cp = variable_get(VAR_FTP_PATH);
     if (!cp) {
-	msgConfirm("You haven't specified an FTP server!  Please visit\nthe Options editor and select a Media type.");
+	if (DITEM_STATUS(mediaSetFTP(NULL)) == DITEM_FAILURE || (cp = variable_get(VAR_FTP_PATH)) == NULL)
 	return FALSE;
     }
 
@@ -166,6 +166,7 @@ mediaGetFTP(Device *dev, char *file, Boolean probe)
 	    char *cp = variable_get(VAR_FTP_PATH);
 
 	    dev->shutdown(dev);
+	    variable_unset(VAR_FTP_PATH);
 	    /* If we can't re-initialize, just forget it */
 	    if (!dev->init(dev))
 		return IO_ERROR;
@@ -225,7 +226,6 @@ mediaShutdownFTP(Device *dev)
 	FtpClose(ftp);
 	ftp = NULL;
     }
-    variable_unset(VAR_FTP_PATH);
     /* (*netdev->shutdown)(netdev); */
     ftpInitted = FALSE;
 }
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index f1c4562..46a24f4 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.121 1996/10/01 14:08:15 jkh Exp $
+ * $Id: install.c,v 1.122 1996/10/02 08:25:09 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -404,6 +404,8 @@ installNovice(dialogMenuItem *self)
 		   "prompt and go back into the installation menus to try and retry\n"
 		   "whichever operations have failed.");
 	mediaDevice->shutdown(mediaDevice);
+	if (mediaDevice->type == DEVICE_TYPE_FTP)
+	    variable_unset(VAR_FTP_PATH);
 	return i | DITEM_RECREATE;
 
     }