summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1995-11-12 07:27:58 +0000
committerjkh <jkh@FreeBSD.org>1995-11-12 07:27:58 +0000
commit0cb4eade3b2a8ffd277c79ff328c71b8e4ee77fc (patch)
tree580b9a4dd988914d3ecf08f359307e8b6401b5c8 /release
parent8bcc3104704a39a32abfe55d0bf54b22cdfdd14a (diff)
downloadFreeBSD-src-0cb4eade3b2a8ffd277c79ff328c71b8e4ee77fc.zip
FreeBSD-src-0cb4eade3b2a8ffd277c79ff328c71b8e4ee77fc.tar.gz
Make editor start on right screen for anonFTP setup.
Don't clobber mediaDevice if post-configuring networking from CDROM.
Diffstat (limited to 'release')
-rw-r--r--release/sysinstall/anonFTP.c9
-rw-r--r--release/sysinstall/installFinal.c6
2 files changed, 11 insertions, 4 deletions
diff --git a/release/sysinstall/anonFTP.c b/release/sysinstall/anonFTP.c
index 350c1a7..389f48b 100644
--- a/release/sysinstall/anonFTP.c
+++ b/release/sysinstall/anonFTP.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: anonFTP.c,v 1.4 1995/11/11 11:49:22 jkh Exp $
+ * $Id: anonFTP.c,v 1.5 1995/11/11 11:56:40 jkh Exp $
*
* Copyright (c) 1995
* Coranth Gryphon. All rights reserved.
@@ -468,8 +468,13 @@ configAnonFTP(char *unused)
dialog_clear();
if (!msgYesNo("Create a welcome message file for anonymous FTP users?")) {
+ char cmd[256];
+
+ dialog_clear();
+ msgNotify("Uncompressing the editor - please wait..");
vsystem("echo Your welcome message here. > %s/etc/%s", tconf.homedir, MOTD_FILE);
- vsystem("/stand/ee %s/etc/%s", tconf.homedir, MOTD_FILE);
+ sprintf(cmd, "/stand/ee %s/etc/%s", tconf.homedir, MOTD_FILE);
+ systemExecute(cmd);
}
}
else {
diff --git a/release/sysinstall/installFinal.c b/release/sysinstall/installFinal.c
index da9566a..a5f937f 100644
--- a/release/sysinstall/installFinal.c
+++ b/release/sysinstall/installFinal.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: installFinal.c,v 1.17 1995/11/04 17:16:45 jkh Exp $
+ * $Id: installFinal.c,v 1.18 1995/11/09 02:31:59 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard & Coranth Gryphon. All rights reserved.
@@ -192,7 +192,7 @@ configNFSServer(char *unused)
"an /etc/exports file to indicate which hosts are allowed certain\n"
"kinds of access to your local file systems.\n"
"Press [ENTER] now to invoke an editor on /etc/exports (the editor\n"
- "may take several moments to start up the first time - please be\n"
+ "may take a little while to uncompress the first time - please be\n"
"patient!)");
vsystem("echo '#The following examples export /usr to 3 machines named after ducks,' > /etc/exports");
vsystem("echo '#/home and all directories under it to machines named after dead rock stars' >> /etc/exports");
@@ -203,6 +203,8 @@ configNFSServer(char *unused)
vsystem("echo '#' >> /etc/exports");
vsystem("echo '# You should replace these lines with your actual exported filesystems.' >> /etc/exports");
vsystem("echo >> /etc/exports");
+ dialog_clear();
+ msgNotify("Uncompressing the editor.. Please wait.");
systemExecute("ee /etc/exports");
}
variable_set2("nfs_server", "YES");
OpenPOWER on IntegriCloud