aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/sade
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>2001-03-12 21:26:06 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>2001-03-12 21:26:06 +0000
commit061de247e086cd32191109b99a893c1c47002b0f (patch)
treeb9283c4fd81b1761457b82f6e129cd7c68071e9a /usr.sbin/sade
parent95b2071c56576622fe542b59fa8c5dd2f80fa9ad (diff)
downloadsrc-061de247e086cd32191109b99a893c1c47002b0f.tar.gz
src-061de247e086cd32191109b99a893c1c47002b0f.zip
Allow a script-using to disable the emergency holographic shell as
a security measure. Requested by: "David E. Cross" <crossd@enterprise.cs.rpi.edu>
Notes
Notes: svn path=/head/; revision=74177
Diffstat (limited to 'usr.sbin/sade')
-rw-r--r--usr.sbin/sade/install.c3
-rw-r--r--usr.sbin/sade/sade.85
-rw-r--r--usr.sbin/sade/sade.h1
3 files changed, 7 insertions, 2 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 638530ad302b..4c51dac1f30e 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -240,7 +240,8 @@ installInitial(void)
status = DITEM_FAILURE;
/* stick a helpful shell over on the 4th VTY */
- systemCreateHoloshell();
+ if (!variable_get(VAR_NO_HOLOSHELL))
+ systemCreateHoloshell();
alreadyDone = TRUE;
return status;
diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8
index 440a4290253c..53d9cbd4926e 100644
--- a/usr.sbin/sade/sade.8
+++ b/usr.sbin/sade/sade.8
@@ -652,7 +652,10 @@ Start an upgrade installation.
None
.It installFixitHoloShell
Start up the "emergency holographic shell" over on VTY4
-if running as init.
+if running as init. This will also happen automatically
+as part of the installation process unless
+.Ar noHoloShell
+is set.
.Pp
.Sy Variables :
None
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 63f32b71ba87..a1ea129efc90 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -147,6 +147,7 @@
#define VAR_NFS_SERVER "nfs_server_enable"
#define VAR_NO_CONFIRM "noConfirm"
#define VAR_NO_ERROR "noError"
+#define VAR_NO_HOLOSHELL "noHoloShell"
#define VAR_NO_WARN "noWarn"
#define VAR_NO_USR "noUsr"
#define VAR_NONINTERACTIVE "nonInteractive"