summaryrefslogtreecommitdiff
path: root/usr.sbin/sysmerge/sysmerge.8
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2010-07-05 08:30:29 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2010-07-05 08:30:29 +0000
commit777fc166cdfa04286109c8b8a32ab7e979bfb65b (patch)
treef0a9f6bb5f4d6d230fe7c66d5514c2548fb4be19 /usr.sbin/sysmerge/sysmerge.8
parentbec5f3b3bb1a8472c016dc94caea26f44c8390bf (diff)
Automatically install missing users and groups.
(does *NOT* touch existing users/groups) "I like it" from several... inputs from sthen@ and halex@ ok krw@ halex@ sthen@
Diffstat (limited to 'usr.sbin/sysmerge/sysmerge.8')
-rw-r--r--usr.sbin/sysmerge/sysmerge.812
1 files changed, 10 insertions, 2 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8
index 76e4b5a26c0..5bd1c645ef1 100644
--- a/usr.sbin/sysmerge/sysmerge.8
+++ b/usr.sbin/sysmerge/sysmerge.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysmerge.8,v 1.31 2010/03/20 09:45:11 ajacoutot Exp $
+.\" $OpenBSD: sysmerge.8,v 1.32 2010/07/05 08:30:28 ajacoutot Exp $
.\"
.\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org>
.\"
@@ -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: March 20 2010 $
+.Dd $Mdocdate: July 5 2010 $
.Dt SYSMERGE 8
.Os
.Sh NAME
@@ -108,6 +108,12 @@ and
are created using helper scripts and are
.Sy always
compared.
+Users and groups that are missing from the current installation but
+present in the new
+.Xr master.passwd 5
+and
+.Xr group 5
+files will be automatically created.
.Pp
.Nm
will finish by running
@@ -240,10 +246,12 @@ Files and directories to ignore from comparison.
.El
.Sh SEE ALSO
.Xr cap_mkdb 1 ,
+.Xr chpass 1 ,
.Xr diff 1 ,
.Xr mktemp 1 ,
.Xr more 1 ,
.Xr sdiff 1 ,
+.Xr groupadd 8 ,
.Xr MAKEDEV 8 ,
.Xr makemap 8 ,
.Xr mtree 8 ,