Move nologin from /etc to /var/run. This means one less file that has

to be written to /etc.

The only essential change is in paths.h, so any third-party software
written correctly will pick it up in the next rebuild.

Reviewed by:	the committers list (actually an old version)
This commit is contained in:
Satoshi Asami 1999-01-11 09:07:42 +00:00
parent a85c0f554d
commit 16ceea1b93
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=42515
5 changed files with 12 additions and 14 deletions

View file

@ -9,7 +9,7 @@
# This file controls resource limits, accounting limits and
# default user environment settings.
#
# $Id: login.conf,v 1.23 1998/12/27 23:55:01 cwt Exp $
# $Id: login.conf,v 1.24 1998/12/29 22:17:31 hoek Exp $
#
# Default settings effectively disable resource limits, see the
@ -24,7 +24,7 @@ default:\
:welcome=/etc/motd:\
:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,EDITOR=/usr/bin/ee:\
:path=~/bin /bin /usr/bin /usr/local/bin:\
:nologin=/etc/nologin:\
:nologin=/var/run/nologin:\
:cputime=unlimited:\
:datasize=unlimited:\
:stacksize=unlimited:\

4
etc/rc
View file

@ -1,5 +1,5 @@
#!/bin/sh
# $Id: rc,v 1.164 1999/01/06 14:01:52 peter Exp $
# $Id: rc,v 1.165 1999/01/10 22:06:22 n_hibma Exp $
# From: @(#)rc 5.27 (Berkeley) 6/5/91
# System startup script run by init on autoboot
@ -144,8 +144,6 @@ echo .
chmod 666 /dev/tty[pqrsPQRS]*
# clean up left-over files
rm -f /etc/nologin
clean_var # If it hasn't already been done
rm /var/run/clean_var

View file

@ -56,7 +56,7 @@
#define _PATH_MAILDIR "/var/mail"
#define _PATH_MAN "/usr/share/man"
#define _PATH_MEM "/dev/mem"
#define _PATH_NOLOGIN "/etc/nologin"
#define _PATH_NOLOGIN "/var/run/nologin"
#define _PATH_SENDMAIL "/usr/sbin/sendmail"
#define _PATH_SHELLS "/etc/shells"
#define _PATH_TTY "/dev/tty"

View file

@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)shutdown.8 8.2 (Berkeley) 4/27/95
.\" $Id: shutdown.8,v 1.7 1998/12/11 10:25:55 bde Exp $
.\" $Id: shutdown.8,v 1.8 1998/12/11 10:35:38 bde Exp $
.\"
.Dd Dec 11, 1998
.Dt SHUTDOWN 8
@ -110,7 +110,7 @@ and starting at ten hours before shutdown, warning messages are displayed
on the terminals of all users logged in. Five minutes before
shutdown, or immediately if shutdown is in less than 5 minutes,
logins are disabled by creating
.Pa /etc/nologin
.Pa /var/run/nologin
and copying the
warning message there. If this file exists when a user attempts to
log in,
@ -129,13 +129,13 @@ to bring the system down to single-user state (depending on above
options).
The time of the shutdown and the warning message
are placed in
.Pa /etc/nologin
.Pa /var/run/nologin
and should be used to
inform the users about when the system will be back up
and why it is going down (or anything else).
.Sh FILES
.Bl -tag -width /etc/nologin -compact
.It Pa /etc/nologin
.Bl -tag -width /var/run/nologin -compact
.It Pa /var/run/nologin
tells login not to let anyone log in
.El
.Sh SEE ALSO

View file

@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)login.1 8.2 (Berkeley) 5/5/94
.\" $Id: login.1,v 1.11 1998/10/09 06:36:22 markm Exp $
.\" $Id: login.1,v 1.12 1998/12/01 17:05:08 dillon Exp $
.\"
.Dd May 5, 1994
.Dt LOGIN 1
@ -81,7 +81,7 @@ option disables this behavior.
.El
.Pp
If the file
.Pa /etc/nologin
.Pa /var/run/nologin
exists,
.Nm
displays its contents to the user and exits.
@ -160,7 +160,7 @@ login access control table
login class capabilities database
.It Pa /etc/motd
message-of-the-day
.It Pa /etc/nologin
.It Pa /var/run/nologin
disallows logins
.It Pa /etc/skey.access
skey password control table