From 5d94d8b6a2699097e9b6607ea53febe3b8087d15 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov <ru@FreeBSD.org> Date: Thu, 1 Jul 1999 13:33:56 +0000 Subject: [PATCH] Turn System V command line syntax ``on'' by default. Requested by: peter Reviewed by: des, billf --- sbin/init/Makefile | 7 ++----- sbin/init/init.8 | 9 ++------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/sbin/init/Makefile b/sbin/init/Makefile index 105431807156..af8f90ac6cfa 100644 --- a/sbin/init/Makefile +++ b/sbin/init/Makefile @@ -1,14 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 -# $Id: Makefile,v 1.15 1998/01/20 10:39:56 bde Exp $ +# $Id: Makefile,v 1.16 1999/06/18 09:08:06 ru Exp $ PROG= init MAN8= init.8 BINMODE=500 INSTALLFLAGS=-fschg -CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP - -# Uncomment the following line to activate System V compatibility mode -#CFLAGS+=-DCOMPAT_SYSV_INIT +CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) DISTRIBUTION=des diff --git a/sbin/init/init.8 b/sbin/init/init.8 index 6623921469ed..a482dfa39b44 100644 --- a/sbin/init/init.8 +++ b/sbin/init/init.8 @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)init.8 8.3 (Berkeley) 4/18/94 -.\" $Id: init.8,v 1.14 1999/06/16 20:01:18 ru Exp $ +.\" $Id: init.8,v 1.15 1999/06/18 09:08:08 ru Exp $ .\" .Dd April 18, 1994 .Dt INIT 8 @@ -287,12 +287,7 @@ If, at bootstrap time, the process cannot be located, the system will panic with the message .Dq "panic: init died (signal %d, exit %d)" . .Pp -The second synopsis form is only available if -.Nm -was compiled with the -.Em COMPAT_SYSV_INIT -option. -In this case, +If run as a user process as shown in the second synopsis line, .Nm will emulate .At V