Fix various bogons reported in this PR.

PR:		4765
Submitted by:	fdiv

4 files changed, 8 insertions, 7 deletions

diff --git a/usr.sbin/sysinstall/help/tcp.hlp b/usr.sbin/sysinstall/help/tcp.hlp
index 05fe118..9faa797 100644
--- a/usr.sbin/sysinstall/help/tcp.hlp
+++ b/usr.sbin/sysinstall/help/tcp.hlp
@@ -4,7 +4,7 @@ given interface (which was selected from the menu before this screen).
 
 PLIP/SLIP users - please read through to the end of this doc!
 
-You can move through the fields with the TAB, BACK-TAB and RETURN
+You can move through the fields with the TAB, BACK-TAB and ENTER
 keys.  To edit a field, use DELETE or BACKSPACE.  You may also use ^A
 (control-A) to go to the beginning of the line, ^E (control-E) to go
 to the end, ^F (control-F) to go forward a character, ^B (control-B)
diff --git a/usr.sbin/sysinstall/help/usage.hlp b/usr.sbin/sysinstall/help/usage.hlp
index 8c497f0..d9274d5 100644
--- a/usr.sbin/sysinstall/help/usage.hlp
+++ b/usr.sbin/sysinstall/help/usage.hlp
@@ -10,7 +10,7 @@ encounter during this installation:
 KEY             ACTION
 ---             ------
 SPACE           Select or toggle the current item.
-RETURN          Finish with a menu or item.
+ENTER          Finish with a menu or item.
 UP ARROW        Move to previous item (or up, in a text display box).
 DOWN ARROW      Move to next item (or down, in a text display box).
 TAB             Move to next item or group.
diff --git a/usr.sbin/sysinstall/help/usermgmt.hlp b/usr.sbin/sysinstall/help/usermgmt.hlp
index 4d1b9f5..8a2664d 100644
--- a/usr.sbin/sysinstall/help/usermgmt.hlp
+++ b/usr.sbin/sysinstall/help/usermgmt.hlp
@@ -1,6 +1,6 @@
 These screens allow you to add groups and users to your system.
 
-You can move through the fields with the TAB, BACK-TAB and RETURN
+You can move through the fields with the TAB, BACK-TAB and ENTER
 keys.  To edit a field, use DELETE or BACKSPACE.  You may also use ^A
 (control-A) to go to the beginning of the line, ^E (control-E) to go
 to the end, ^F (control-F) to go forward a character, ^B (control-B)
diff --git a/usr.sbin/sysinstall/package.c b/usr.sbin/sysinstall/package.c
index ff9415e..da1ec9c 100644
--- a/usr.sbin/sysinstall/package.c
+++ b/usr.sbin/sysinstall/package.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: package.c,v 1.63 1997/09/16 10:14:22 jkh Exp $
+ * $Id: package.c,v 1.64 1997/09/17 16:18:16 pst Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -115,11 +115,12 @@ package_extract(Device *dev, char *name, Boolean depended)
     /* Be initially optimistic */
     ret = DITEM_SUCCESS | DITEM_RESTORE;
     /* Make a couple of paranoid locations for temp files to live if user specified none */
-    if (!variable_get("PKG_TMPDIR")) {
+    if (!variable_get(VAR_PKG_TMPDIR)) {
 	/* Set it to a location with as much space as possible */
-	variable_set2("PKG_TMPDIR", "/usr/tmp");
+	variable_set2(VAR_PKG_TMPDIR, "/usr/tmp");
     }
-    Mkdir(variable_get("PKG_TMPDIR"));
+    Mkdir(variable_get(VAR_PKG_TMPDIR));
+    vsystem("chmod 1777 %s", variable_get(VAR_PKG_TMPDIR));
 
     if (!index(name, '/'))
 	sprintf(path, "packages/All/%s%s", name, strstr(name, ".tgz") ? "" : ".tgz");