From 44c679fcea6f9b422551691fdee4b31168abe933 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Wed, 31 Aug 2011 21:48:20 +0000 Subject: Now moving to new style rc naming scheme --- Makefile | 4 ++-- man7/ezjail.7 | 10 +++++----- man8/ezjail-admin.8 | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index a2a526b..fbf0232 100755 --- a/Makefile +++ b/Makefile @@ -11,11 +11,11 @@ install: cp -p ezjail.conf.sample ${PREFIX}/etc/ cp -R -p examples/example ${PREFIX}/share/examples/ezjail/ cp -R -p examples/nullmailer-example ${PREFIX}/share/examples/ezjail/ - sed s:EZJAIL_PREFIX:${PREFIX}: ezjail.sh > ${PREFIX}/etc/rc.d/ezjail.sh + sed s:EZJAIL_PREFIX:${PREFIX}: ezjail.sh > ${PREFIX}/etc/rc.d/ezjail sed s:EZJAIL_PREFIX:${PREFIX}: ezjail-admin > ${PREFIX}/bin/ezjail-admin sed s:EZJAIL_PREFIX:${PREFIX}: man8/ezjail-admin.8 > ${PREFIX}/man/man8/ezjail-admin.8 sed s:EZJAIL_PREFIX:${PREFIX}: man5/ezjail.conf.5 > ${PREFIX}/man/man5/ezjail.conf.5 sed s:EZJAIL_PREFIX:${PREFIX}: man7/ezjail.7 > ${PREFIX}/man/man7/ezjail.7 - chmod 755 ${PREFIX}/etc/rc.d/ezjail.sh ${PREFIX}/bin/ezjail-admin + chmod 755 ${PREFIX}/etc/rc.d/ezjail ${PREFIX}/bin/ezjail-admin chown -R root:wheel ${PREFIX}/man/man8/ezjail-admin.8 ${PREFIX}/man/man5/ezjail.conf.5 ${PREFIX}/man/man7/ezjail.7 ${PREFIX}/share/examples/ezjail/ chmod 0440 ${PREFIX}/share/examples/ezjail/example/usr/local/etc/sudoers diff --git a/man7/ezjail.7 b/man7/ezjail.7 index 334a5db..aa744ca 100644 --- a/man7/ezjail.7 +++ b/man7/ezjail.7 @@ -57,7 +57,7 @@ are provided. A sample configuration is installed as .Pa EZJAIL_PREFIX/etc/ezjail.conf.sample . .Pp A script is also installed as -.Pa ezjail.sh +.Pa ezjail in the rc.d system to allow jails under ezjails control to be started at boot time, given ezjail is enabled by setting the .Xr rc.conf 5 @@ -354,7 +354,7 @@ in the host, using the same sources. Like all .Xr rc 8 scripts, the ezjail script -.Pa EZJAIL_PREFIX/etc/rc.d/ezjail.sh +.Pa EZJAIL_PREFIX/etc/rc.d/ezjail accepts parameters .Cm start , restart No and Cm stop, No running, restarting and stopping all (non-blocking) jails under ezjail's control by default. When passed an @@ -381,7 +381,7 @@ Note that jails configured to be in the .Em norun state (using .Nm Cm config Fl r Ar norun Ar jailname ) -are never started by the ezjail.sh script. +are never started by the ezjail rc script. .Pp As a convenient shortcut, the .Nm @@ -390,7 +390,7 @@ if they look like valid parameters. .Pp Even if ezjail is not enabled in the .Xr rc.conf 5 , -ezjail.sh can be used to start and stop jails by prepending +rc.d/ezjail can be used to start and stop jails by prepending .Cm force No or Cm one No to the Cm start, restart No or Cm stop No parameter. Refer to .Xr rc 8 @@ -632,7 +632,7 @@ variable to create the filesystem in. .Sh FILES .Pa EZJAIL_PREFIX/bin/ezjail-admin .br -.Pa EZJAIL_PREFIX/etc/rc.d/ezjail.sh +.Pa EZJAIL_PREFIX/etc/rc.d/ezjail .br .Pa EZJAIL_PREFIX/etc/ezjail.conf .br diff --git a/man8/ezjail-admin.8 b/man8/ezjail-admin.8 index 375bf28..727615b 100644 --- a/man8/ezjail-admin.8 +++ b/man8/ezjail-admin.8 @@ -379,7 +379,7 @@ The following columns are the JID (when it is running), the IP addresses, the na .Pp This is a shortcut to the .Xr rc 8 -.Cm ezjail.sh +.Cm ezjail script. Refer to .Xr ezjail 7 section @@ -585,7 +585,7 @@ filesystem is taken first. .Sh FILES .Pa EZJAIL_PREFIX/bin/ezjail-admin .br -.Pa EZJAIL_PREFIX/etc/rc.d/ezjail.sh +.Pa EZJAIL_PREFIX/etc/rc.d/ezjail .br .Pa EZJAIL_PREFIX/etc/ezjail.conf .br -- cgit v1.2.3