diff options
| -rw-r--r-- | usr.sbin/sade/install.c | 3 | ||||
| -rw-r--r-- | usr.sbin/sade/sade.8 | 5 | ||||
| -rw-r--r-- | usr.sbin/sade/sade.h | 1 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 3 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/sysinstall.8 | 5 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/sysinstall.h | 1 |
6 files changed, 14 insertions, 4 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 638530a..4c51dac 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 440a429..53d9cbd 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 63f32b7..a1ea129 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" diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 638530a..4c51dac 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/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/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8 index 440a429..53d9cbd 100644 --- a/usr.sbin/sysinstall/sysinstall.8 +++ b/usr.sbin/sysinstall/sysinstall.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/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index 63f32b7..a1ea129 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.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" |
