svn commit: r257579 - in head: . tools/build/mk usr.sbin/utx
Ed Schouten
ed at FreeBSD.org
Sun Nov 3 16:43:53 UTC 2013
Author: ed
Date: Sun Nov 3 16:43:52 2013
New Revision: 257579
URL: http://svnweb.freebsd.org/changeset/base/257579
Log:
Remove utxrm(8). This command has been superseded by 'utx rm'.
Modified:
head/ObsoleteFiles.inc
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.sbin/utx/Makefile
head/usr.sbin/utx/utx.8
head/usr.sbin/utx/utx.c
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Sun Nov 3 16:17:06 2013 (r257578)
+++ head/ObsoleteFiles.inc Sun Nov 3 16:43:52 2013 (r257579)
@@ -38,6 +38,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20131103: removal of utxrm(8), use 'utx rm' instead.
+OLD_FILES+=usr/sbin/utxrm
+OLD_FILES+=usr/share/man/man8/utxrm.8.gz
# 20131031: pkg_install has been removed
OLD_FILES+=etc/periodic/daily/220.backup-pkgdb
OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 3 16:17:06 2013 (r257578)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 3 16:43:52 2013 (r257579)
@@ -4147,14 +4147,12 @@ OLD_FILES+=usr/bin/who
OLD_FILES+=usr/sbin/ac
OLD_FILES+=usr/sbin/lastlogin
OLD_FILES+=usr/sbin/utx
-OLD_FILES+=usr/sbin/utxrm
OLD_FILES+=usr/share/man/man1/last.1.gz
OLD_FILES+=usr/share/man/man1/users.1.gz
OLD_FILES+=usr/share/man/man1/who.1.gz
OLD_FILES+=usr/share/man/man8/ac.8.gz
OLD_FILES+=usr/share/man/man8/lastlogin.8.gz
OLD_FILES+=usr/share/man/man8/utx.8.gz
-OLD_FILES+=usr/share/man/man8/utxrm.8.gz
.endif
.if ${MK_WIRELESS} == no
Modified: head/usr.sbin/utx/Makefile
==============================================================================
--- head/usr.sbin/utx/Makefile Sun Nov 3 16:17:06 2013 (r257578)
+++ head/usr.sbin/utx/Makefile Sun Nov 3 16:43:52 2013 (r257579)
@@ -3,7 +3,4 @@
PROG= utx
MAN= utx.8
-LINKS= ${BINDIR}/utx ${BINDIR}/utxrm
-MLINKS= utx.8 utxrm.8
-
.include <bsd.prog.mk>
Modified: head/usr.sbin/utx/utx.8
==============================================================================
--- head/usr.sbin/utx/utx.8 Sun Nov 3 16:17:06 2013 (r257578)
+++ head/usr.sbin/utx/utx.8 Sun Nov 3 16:43:52 2013 (r257579)
@@ -24,12 +24,11 @@
.\"
.\" $FreeBSD$
.\"
-.Dd February 11, 2012
+.Dd November 3, 2013
.Dt UTX 8
.Os
.Sh NAME
-.Nm utx ,
-.Nm utxrm
+.Nm utx
.Nd manage the user accounting database
.Sh SYNOPSIS
.Nm
@@ -40,9 +39,6 @@
.Cm rm
.Ar identifier
.Ar ...
-.Nm utxrm
-.Ar identifier
-.Ar ...
.Sh DESCRIPTION
The
.Nm
@@ -82,11 +78,6 @@ accounting database's active session tab
Identifiers can either be supplied in hexadecimal form as displayed by
.Xr getent 1 ,
or as a string if the identifier allows such a representation.
-.Pp
-To remain backward compatible, this action can also be invoked directly
-by using the
-.Nm utxrm
-command.
.El
.Pp
Because this utility requires write-access to the user accounting
Modified: head/usr.sbin/utx/utx.c
==============================================================================
--- head/usr.sbin/utx/utx.c Sun Nov 3 16:17:06 2013 (r257578)
+++ head/usr.sbin/utx/utx.c Sun Nov 3 16:43:52 2013 (r257579)
@@ -95,10 +95,7 @@ int
main(int argc, char *argv[])
{
- if (argc >= 2 && strcmp(getprogname(), "utxrm") == 0)
- /* For compatibility. */
- return (rm(&argv[1]));
- else if (argc == 2 && strcmp(argv[1], "boot") == 0)
+ if (argc == 2 && strcmp(argv[1], "boot") == 0)
return (boot(BOOT_TIME));
else if (argc == 2 && strcmp(argv[1], "shutdown") == 0)
return (boot(SHUTDOWN_TIME));
@@ -108,7 +105,6 @@ main(int argc, char *argv[])
fprintf(stderr,
"usage: utx boot\n"
" utx shutdown\n"
- " utx rm identifier ...\n"
- " utxrm identifier ...\n");
+ " utx rm identifier ...\n");
exit(1);
}
More information about the svn-src-head
mailing list