From a3154df39cef36d62ed08609a71ada5fbc5341cf Mon Sep 17 00:00:00 2001 From: kn Date: Mon, 8 Nov 2021 16:12:09 +0000 Subject: [PATCH] Rename/move site(8) into install.site(5) These sets/scripts are not commands and there is nothing actually called "site". This is configuration, so use section five. Also rename to what actually exists. Discussed with deraadt schwarze jmc OK deraadt --- distrib/sets/lists/man/mi | 2 +- share/man/man5/Makefile | 5 +++-- share/man/{man8/site.8 => man5/install.site.5} | 11 +++++------ share/man/man8/Makefile | 4 ++-- share/man/man8/autoinstall.8 | 10 +++++----- usr.sbin/sysupgrade/sysupgrade.8 | 10 +++++----- 6 files changed, 21 insertions(+), 21 deletions(-) rename share/man/{man8/site.8 => man5/install.site.5} (94%) diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index 2fcf3a58313..ab52b74cf7e 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -2177,6 +2177,7 @@ ./usr/share/man/man5/ifstated.conf.5 ./usr/share/man/man5/iked.conf.5 ./usr/share/man/man5/info.5 +./usr/share/man/man5/install.site.5 ./usr/share/man/man5/installurl.5 ./usr/share/man/man5/intro.5 ./usr/share/man/man5/ipsec.conf.5 @@ -2561,7 +2562,6 @@ ./usr/share/man/man8/security.8 ./usr/share/man/man8/sendmail.8 ./usr/share/man/man8/sensorsd.8 -./usr/share/man/man8/site.8 ./usr/share/man/man8/sftp-server.8 ./usr/share/man/man8/showmount.8 ./usr/share/man/man8/shutdown.8 diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index a62844dfb0a..89d6c843a1a 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.60 2021/04/10 15:26:47 gnezdo Exp $ +# $OpenBSD: Makefile,v 1.61 2021/11/08 16:12:09 kn Exp $ # $NetBSD: Makefile,v 1.14 1995/05/11 23:13:15 cgd Exp $ MAN= acct.5 ar.5 bsd.port.mk.5 bsd.port.arch.mk.5 bsd.regress.mk.5 \ changelist.5 core.5 \ defaultdomain.5 dir.5 disktab.5 elf.5 ethers.5 fbtab.5 files.conf.5 \ - fs.5 fstab.5 genassym.cf.5 group.5 hostname.if.5 hosts.5 installurl.5 \ + fs.5 fstab.5 genassym.cf.5 group.5 hostname.if.5 hosts.5 \ + install.site.8 installurl.5 \ intro.5 login.conf.5 mandoc.db.5 mixerctl.conf.5 \ mk.conf.5 moduli.5 motd.5 mygate.5 myname.5 netgroup.5 passwd.5 \ pf.conf.5 pf.os.5 port-modules.5 cabal-module.5 \ diff --git a/share/man/man8/site.8 b/share/man/man5/install.site.5 similarity index 94% rename from share/man/man8/site.8 rename to share/man/man5/install.site.5 index 03acf0b87d9..3545bda3d68 100644 --- a/share/man/man8/site.8 +++ b/share/man/man5/install.site.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: site.8,v 1.3 2021/11/06 01:37:02 kn Exp $ +.\" $OpenBSD: install.site.5,v 1.1 2021/11/08 16:12:09 kn Exp $ .\" .\" Copyright (c) 2021 Klemens Nanni .\" @@ -14,11 +14,10 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: November 6 2021 $ -.Dt SITE 8 +.Dd $Mdocdate: November 8 2021 $ +.Dt INSTALL.SITE 5 .Os .Sh NAME -.Nm site , .Nm install.site , .Nm upgrade.site .Nd OpenBSD installation and upgrade customization @@ -43,7 +42,7 @@ and untarred with the .Fl xzphf options. .Pp -.Nm +.Em siteXY sets must be included in .Pa index.txt @@ -70,7 +69,7 @@ Generic post-install script. .El .Sh EXAMPLES Create -.Nm +.Em site70 sets and update the index: .Bd -literal -offset indent # tar -czhf site70.tgz generic/ diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile index 1d9a6d1a625..7f638af0105 100644 --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.103 2021/11/06 01:24:37 kn Exp $ +# $OpenBSD: Makefile,v 1.104 2021/11/08 16:12:10 kn Exp $ # $NetBSD: Makefile,v 1.13 1996/03/28 21:36:40 mark Exp $ # @(#)Makefile 8.1 (Berkeley) 6/5/93 @@ -6,7 +6,7 @@ MAN= afterboot.8 autoinstall.8 boot_config.8 bulk.8 \ crash.8 daily.8 \ diskless.8 genassym.sh.8 intro.8 netstart.8 rc.8 \ rc.conf.8 rc.d.8 rc.shutdown.8 rc.subr.8 release.8 \ - security.8 site.8 ssl.8 starttls.8 sticky.8 yp.8 + security.8 ssl.8 starttls.8 sticky.8 yp.8 SUBDIR= man8.alpha man8.amd64 man8.arm64 man8.armv7 \ man8.hppa man8.i386 man8.landisk \ diff --git a/share/man/man8/autoinstall.8 b/share/man/man8/autoinstall.8 index b21a7cef532..9fef3643898 100644 --- a/share/man/man8/autoinstall.8 +++ b/share/man/man8/autoinstall.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: autoinstall.8,v 1.24 2021/11/06 01:24:37 kn Exp $ +.\" $OpenBSD: autoinstall.8,v 1.25 2021/11/08 16:12:10 kn Exp $ .\" .\" Copyright (c) 2013 Robert Peichaer .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: November 6 2021 $ +.Dd $Mdocdate: November 8 2021 $ .Dt AUTOINSTALL 8 .Os .Sh NAME @@ -33,7 +33,7 @@ If that fails, the installer asks for the location which can either be a URL or a local path. .Pp See -.Xr site 8 +.Xr install.site 5 for how to provide custom configuration. .Pp To start unattended installation or upgrade choose '(A)utoinstall' at the @@ -239,8 +239,8 @@ host foo { .Sh SEE ALSO .Xr dhcp-options 5 , .Xr dhcpd.conf 5 , -.Xr diskless 8 , -.Xr site 8 +.Xr install.site 5 , +.Xr diskless 8 .Sh HISTORY The .Nm diff --git a/usr.sbin/sysupgrade/sysupgrade.8 b/usr.sbin/sysupgrade/sysupgrade.8 index 7f37c931144..444c74aa64b 100644 --- a/usr.sbin/sysupgrade/sysupgrade.8 +++ b/usr.sbin/sysupgrade/sysupgrade.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysupgrade.8,v 1.11 2021/11/06 01:24:37 kn Exp $ +.\" $OpenBSD: sysupgrade.8,v 1.12 2021/11/08 16:12:10 kn Exp $ .\" .\" Copyright (c) 2019 Florian Obser .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: November 6 2021 $ +.Dd $Mdocdate: November 8 2021 $ .Dt SYSUPGRADE 8 .Os .Sh NAME @@ -69,7 +69,7 @@ This is the default if the system is currently running a snapshot. .El .Pp See -.Xr site 8 +.Xr upgrade.site 5 for how to customize the upgrade process. .Sh FILES .Bl -tag -width "/auto_upgrade.conf" -compact @@ -86,9 +86,9 @@ Directory the upgrade is downloaded to. .Sh SEE ALSO .Xr signify 1 , .Xr installurl 5 , +.Xr upgrade.site 5 , .Xr autoinstall 8 , -.Xr release 8 , -.Xr site 8 +.Xr release 8 .Sh HISTORY .Nm first appeared in -- 2.20.1