Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/share/man/man8 move creds_msdos.8 into the normal place and ...



details:   https://anonhg.NetBSD.org/src/rev/5b183363def5
branches:  trunk
changeset: 999607:5b183363def5
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 12 09:03:31 2019 +0000

description:
move creds_msdos.8 into the normal place and install it.

diffstat:

 distrib/sets/lists/man/mi                  |   19 ++-
 distrib/utils/embedded/files/creds_msdos.8 |  121 -----------------------------
 share/man/man8/Makefile                    |    6 +-
 share/man/man8/creds_msdos.8               |  121 +++++++++++++++++++++++++++++
 share/man/man8/wizd.8                      |    3 +-
 5 files changed, 138 insertions(+), 132 deletions(-)

diffs (truncated from 394 to 300 lines):

diff -r 51a7de954729 -r 5b183363def5 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Wed Jun 12 06:53:21 2019 +0000
+++ b/distrib/sets/lists/man/mi Wed Jun 12 09:03:31 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1647 2019/06/06 05:32:29 mrg Exp $
+# $NetBSD: mi,v 1.1648 2019/06/12 09:03:32 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1131,9 +1131,9 @@
 ./usr/share/man/cat4/gpib.0                    man-sys-catman          .cat
 ./usr/share/man/cat4/gpio.0                    man-sys-catman          .cat
 ./usr/share/man/cat4/gpioiic.0                 man-sys-catman          .cat
+./usr/share/man/cat4/gpioirq.0                 man-sys-catman          .cat
 ./usr/share/man/cat4/gpiolock.0                        man-sys-catman          .cat
 ./usr/share/man/cat4/gpioow.0                  man-sys-catman          .cat
-./usr/share/man/cat4/gpioirq.0                 man-sys-catman          .cat
 ./usr/share/man/cat4/gpiopps.0                 man-sys-catman          .cat
 ./usr/share/man/cat4/gpiopwm.0                 man-sys-catman          .cat
 ./usr/share/man/cat4/gpiosim.0                 man-sys-catman          .cat
@@ -2290,8 +2290,8 @@
 ./usr/share/man/cat5/wtmpx.0                   man-sys-catman          .cat
 ./usr/share/man/cat5/ypserv.acl.0              man-obsolete            obsolete
 ./usr/share/man/cat7/ascii.0                   man-reference-catman    .cat
+./usr/share/man/cat7/atf.0                     man-atf-catman          .cat,atf
 ./usr/share/man/cat7/audio.0                   man-obsolete            obsolete
-./usr/share/man/cat7/atf.0                     man-atf-catman          .cat,atf
 ./usr/share/man/cat7/c.0                       man-reference-catman    .cat
 ./usr/share/man/cat7/c78.0                     man-reference-catman    .cat
 ./usr/share/man/cat7/c89.0                     man-reference-catman    .cat
@@ -2468,6 +2468,7 @@
 ./usr/share/man/cat8/comsat.0                  man-man-catman          .cat
 ./usr/share/man/cat8/cpuctl.0                  man-sysutil-catman      .cat
 ./usr/share/man/cat8/crash.0                   man-sysutil-catman      .cat
+./usr/share/man/cat8/creds_msdos.0             man-sysutil-catman      .cat
 ./usr/share/man/cat8/cron.0                    man-cron-catman         .cat
 ./usr/share/man/cat8/dbsym.0                   man-sysutil-catman      binutils,.cat
 ./usr/share/man/cat8/ddns-confgen.0            man-bind-catman         .cat
@@ -4297,9 +4298,9 @@
 ./usr/share/man/html4/gpib.html                        man-sys-htmlman         html
 ./usr/share/man/html4/gpio.html                        man-sys-htmlman         html
 ./usr/share/man/html4/gpioiic.html             man-sys-htmlman         html
+./usr/share/man/html4/gpioirq.html             man-sys-htmlman         html
 ./usr/share/man/html4/gpiolock.html            man-sys-htmlman         html
 ./usr/share/man/html4/gpioow.html              man-sys-htmlman         html
-./usr/share/man/html4/gpioirq.html             man-sys-htmlman         html
 ./usr/share/man/html4/gpiopps.html             man-sys-htmlman         html
 ./usr/share/man/html4/gpiopwm.html             man-sys-htmlman         html
 ./usr/share/man/html4/gpiosim.html             man-sys-htmlman         html
@@ -5358,8 +5359,8 @@
 ./usr/share/man/html5/wtmp.html                        man-sys-htmlman         html
 ./usr/share/man/html5/wtmpx.html               man-sys-htmlman         html
 ./usr/share/man/html7/ascii.html               man-reference-htmlman   html
+./usr/share/man/html7/atf.html                 man-atf-htmlman         html,atf
 ./usr/share/man/html7/audio.html               man-obsolete            obsolete
-./usr/share/man/html7/atf.html                 man-atf-htmlman         html,atf
 ./usr/share/man/html7/c.html                   man-reference-htmlman   html
 ./usr/share/man/html7/c78.html                 man-reference-htmlman   html
 ./usr/share/man/html7/c89.html                 man-reference-htmlman   html
@@ -5494,6 +5495,7 @@
 ./usr/share/man/html8/comsat.html              man-man-htmlman         html
 ./usr/share/man/html8/cpuctl.html              man-sysutil-htmlman     html
 ./usr/share/man/html8/crash.html               man-sysutil-htmlman     html
+./usr/share/man/html8/creds_msdos.html         man-sysutil-htmlman     html
 ./usr/share/man/html8/cron.html                        man-cron-htmlman        html
 ./usr/share/man/html8/dbsym.html               man-sysutil-htmlman     binutils,html
 ./usr/share/man/html8/ddns-confgen.html                man-bind-htmlman        html
@@ -6746,7 +6748,6 @@
 ./usr/share/man/man1/xmlwf.1                   man-util-man            .man
 ./usr/share/man/man1/xz.1                      man-util-man            .man
 ./usr/share/man/man1/xzcat.1                   man-util-man            .man
-./usr/share/man/man1/ztest.1                   man-zfs-man             zfs,.man
 ./usr/share/man/man1/yes.1                     man-util-man            .man
 ./usr/share/man/man1/ypcat.1                   man-nis-man             yp,.man
 ./usr/share/man/man1/ypmatch.1                 man-nis-man             yp,.man
@@ -6762,6 +6763,7 @@
 ./usr/share/man/man1/zless.1                   man-util-man            .man
 ./usr/share/man/man1/zmore.1                   man-util-man            .man
 ./usr/share/man/man1/znew.1                    man-util-man            .man
+./usr/share/man/man1/ztest.1                   man-zfs-man             zfs,.man
 ./usr/share/man/man3/atari/ahdi_buildlabel.3   man-obsolete            obsolete
 ./usr/share/man/man3/atari/ahdi_checklabel.3   man-obsolete            obsolete
 ./usr/share/man/man3/atari/ahdi_readlabel.3    man-obsolete            obsolete
@@ -7237,9 +7239,9 @@
 ./usr/share/man/man4/gpib.4                    man-sys-man             .man
 ./usr/share/man/man4/gpio.4                    man-sys-man             .man
 ./usr/share/man/man4/gpioiic.4                 man-sys-man             .man
+./usr/share/man/man4/gpioirq.4                 man-sys-man             .man
 ./usr/share/man/man4/gpiolock.4                        man-sys-man             .man
 ./usr/share/man/man4/gpioow.4                  man-sys-man             .man
-./usr/share/man/man4/gpioirq.4                 man-sys-man             .man
 ./usr/share/man/man4/gpiopps.4                 man-sys-man             .man
 ./usr/share/man/man4/gpiopwm.4                 man-sys-man             .man
 ./usr/share/man/man4/gpiosim.4                 man-sys-man             .man
@@ -8396,8 +8398,8 @@
 ./usr/share/man/man5/wtmpx.5                   man-sys-man             .man
 ./usr/share/man/man5/ypserv.acl.5              man-obsolete            obsolete
 ./usr/share/man/man7/ascii.7                   man-reference-man       .man
+./usr/share/man/man7/atf.7                     man-atf-man             .man,atf
 ./usr/share/man/man7/audio.7                   man-obsolete            obsolete
-./usr/share/man/man7/atf.7                     man-atf-man             .man,atf
 ./usr/share/man/man7/c.7                       man-reference-man       .man
 ./usr/share/man/man7/c78.7                     man-reference-man       .man
 ./usr/share/man/man7/c89.7                     man-reference-man       .man
@@ -8573,6 +8575,7 @@
 ./usr/share/man/man8/comsat.8                  man-man-man             .man
 ./usr/share/man/man8/cpuctl.8                  man-sysutil-man         .man
 ./usr/share/man/man8/crash.8                   man-crash-man           .man
+./usr/share/man/man8/creds_msdos.8             man-sysutil-man         .man
 ./usr/share/man/man8/cron.8                    man-cron-man            .man
 ./usr/share/man/man8/dbsym.8                   man-sysutil-man         binutils,.man
 ./usr/share/man/man8/ddns-confgen.8            man-bind-man            .man
diff -r 51a7de954729 -r 5b183363def5 distrib/utils/embedded/files/creds_msdos.8
--- a/distrib/utils/embedded/files/creds_msdos.8        Wed Jun 12 06:53:21 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-.\"    $NetBSD: creds_msdos.8,v 1.2 2019/06/11 11:57:14 wiz Exp $
-.\"
-.\" Copyright (c) 2019 Matthew R. Green
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. The name of the author may not be used to endorse or promote products
-.\"    derived from this software without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.Dd June 10, 2019
-.Dt CREDS_MSDOS 8
-.Os
-.Sh NAME
-.Nm creds_msdos
-.Nd automatically add login credentials from MSDOS partition
-.Sh SYNOPSIS
-.Nm
-.Ar start
-.Sh DESCRIPTION
-The
-.Nm
-rc.d script allows automatic addition of login credentials during boot
-using a special file found on the MSDOS partition of a bootable image.
-This script is not distributed with the normal system and is only
-included with pre-installed bootable images.
-The goal is to allow remote access of the system without having to
-edit the primary root file system (which may not be accessible from
-the host the image is being written from), but place this information
-in the MSDOS partition that most platforms can easily access.
-.Pp
-Typically, an installable image (such as
-.Pa arm64.img )
-is written to an SD card or similar media, and has both a native FFS
-partition as well as an MSDOS partition for booting.
-If this script is enabled and has been pointed at the boot partition
-it will inspect the file
-.Pa creds.txt
-for any credentials to be added to the system.
-.Pp
-These are the supported options in the credentials files:
-.Bl -tag -compact -width "sshkeyfilepl" -offset indent
-.It Sy sshkeyfile Ar user Ar keyfile
-.It Sy sshkey Ar user Ar keystring
-.It Sy useraddpwhash Ar user Ar pwhash
-.It Sy useradd Ar user Ar password
-.El
-.Pp
-In all cases
-.Ar user
-is the username to be added, and the user will be
-added to the
-.Dq wheel
-group.
-.Pp
-The sshkeyfile method looks in the MSDOS boot partition for
-the specified file and merges ssh keys from this file into
-.Ar user Ap s
-.Pa ~/.ssh/authorized_keys
-file.
-.Pp
-The sshkey method adds the
-.Ar keystring
-to the
-.Ar user Ap s
-.Pa ~/.ssh/authorized_keys
-file.
-.Pp
-The useraddpwhash method uses
-.Ar pwhash
-as the
-.Ar users Ap s
-password hash.
-.Pp
-The above three methods are the preferred methods.
-.Pp
-For the useradd method
-.Ar password
-is an unencrypted raw password that will be hashed and added to the system.
-This method is not recommended as it leaves unencrypted passwords
-around until such time that the script runs.
-If this method is used then the
-.Pa creds.txt
-file will be shredded and deleted using
-.Dq rm -P
-after the credentials are updated.
-.Sh FILES
-.Pa /boot/creds.txt
-.Sh SEE ALSO
-.Xr pwhash 1 ,
-.Xr rm 1 ,
-.Xr ssh 1 ,
-.Xr ssh_config 5 ,
-.Xr mount_msdos 8 ,
-.Xr sshd 8 ,
-.Xr useradd 8
-.Sh HISTORY
-The
-.Nm
-script appeared in
-.Nx 9.0 .
-.Sh AUTHORS
-.An Matthew R. Green Aq Mt mrg%eterna.com.au@localhost .
diff -r 51a7de954729 -r 5b183363def5 share/man/man8/Makefile
--- a/share/man/man8/Makefile   Wed Jun 12 06:53:21 2019 +0000
+++ b/share/man/man8/Makefile   Wed Jun 12 09:03:31 2019 +0000
@@ -1,10 +1,12 @@
-#      $NetBSD: Makefile,v 1.108 2019/03/25 19:24:30 maxv Exp $
+#      $NetBSD: Makefile,v 1.109 2019/06/12 09:03:32 mrg Exp $
 #      from: @(#)Makefile      8.1 (Berkeley) 6/5/93
 
 MAN=   MAKEDEV.8 MAKEDEV.local.8 afterboot.8 boot.8 compat_30.8 \
        compat_freebsd.8 compat_linux.8 \
        compat_netbsd32.8 compat_sunos.8 \
-       compat_ultrix.8 diskless.8 hpcboot.8 \
+       compat_ultrix.8 \
+       creds_msdos.8 \
+       diskless.8 hpcboot.8 \
        intro.8 nis.8 pam.8 rc.8 rc.subr.8 rescue.8 \
        sysinst.8 veriexec.8 \
        wizd.8
diff -r 51a7de954729 -r 5b183363def5 share/man/man8/creds_msdos.8
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man8/creds_msdos.8      Wed Jun 12 09:03:31 2019 +0000
@@ -0,0 +1,121 @@
+.\"    $NetBSD: creds_msdos.8,v 1.1 2019/06/12 09:03:32 mrg Exp $
+.\"
+.\" Copyright (c) 2019 Matthew R. Green
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. The name of the author may not be used to endorse or promote products
+.\"    derived from this software without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.Dd June 10, 2019
+.Dt CREDS_MSDOS 8
+.Os
+.Sh NAME
+.Nm creds_msdos
+.Nd automatically add login credentials from MSDOS partition
+.Sh SYNOPSIS
+.Nm
+.Ar start
+.Sh DESCRIPTION
+The
+.Nm
+rc.d script allows automatic addition of login credentials during boot



Home | Main Index | Thread Index | Old Index