# HG changeset patch # User Josef 'Jeff' Sipek # Date 1558371585 14400 # Node ID 893b1f7b6690a77c3d14c6077d56d60bee36fbee # Parent 5759ef3a98b8b37eb6aeda7fcec5a0b44cb391fb Move everything from /var/adm to /var/log diff -r 5759ef3a98b8 -r 893b1f7b6690 FEATURES.txt --- a/FEATURES.txt Mon May 20 15:21:44 2019 -0400 +++ b/FEATURES.txt Mon May 20 12:59:45 2019 -0400 @@ -12,6 +12,7 @@ - /etc/log symlink & /var/adm/log directory - /etc/[uw]tmpx symlink - /usr/adm symlink + * moved all /var/adm files to /var/log 1.3 release ----------- diff -r 5759ef3a98b8 -r 893b1f7b6690 bin/su/su.1 --- a/bin/su/su.1 Mon May 20 15:21:44 2019 -0400 +++ b/bin/su/su.1 Mon May 20 12:59:45 2019 -0400 @@ -69,7 +69,7 @@ .sp .LP All attempts to become another user using \fBsu\fR are logged in the log file -\fB/var/adm/sulog\fR (see \fBsulog\fR(4)). +\fB/var/log/sulog\fR (see \fBsulog\fR(4)). .SH SECURITY .sp .LP diff -r 5759ef3a98b8 -r 893b1f7b6690 exception_lists/pmodes --- a/exception_lists/pmodes Mon May 20 15:21:44 2019 -0400 +++ b/exception_lists/pmodes Mon May 20 12:59:45 2019 -0400 @@ -36,14 +36,14 @@ etc/dumpdates -# /var/adm stuff added because std cron jobs for sys/adm expect this -var/adm -var/adm/acct -var/adm/acct/fiscal -var/adm/acct/nite -var/adm/acct/sum -var/adm/sa -var/adm/spellhist +# /var/log stuff added because std cron jobs for sys/adm expect this +var/log +var/log/acct +var/log/acct/fiscal +var/log/acct/nite +var/log/acct/sum +var/log/sa +var/log/spellhist var/mail/:saved var/spool/uucppublic diff -r 5759ef3a98b8 -r 893b1f7b6690 include/lastlog.h --- a/include/lastlog.h Mon May 20 15:21:44 2019 -0400 +++ b/include/lastlog.h Mon May 20 12:59:45 2019 -0400 @@ -48,7 +48,7 @@ char ll_host[sizeof (((struct utmpx *)0)->ut_host)]; }; -#define _PATH_LASTLOG "/var/adm/lastlog" +#define _PATH_LASTLOG "/var/log/lastlog" #ifdef __cplusplus } diff -r 5759ef3a98b8 -r 893b1f7b6690 include/sys/strlog.h --- a/include/sys/strlog.h Mon May 20 15:21:44 2019 -0400 +++ b/include/sys/strlog.h Mon May 20 12:59:45 2019 -0400 @@ -76,7 +76,7 @@ * Private flags for log messages -- used by internal implementation only */ #define SL_CONSONLY 0x1000 /* send message only to /dev/console */ -#define SL_LOGONLY 0x2000 /* send message only to /var/adm/messages */ +#define SL_LOGONLY 0x2000 /* send message only to /var/log/messages */ #define SL_USER 0x4000 /* send message to user's terminal */ #define SL_PANICMSG 0x8000 /* message was created while panicking */ diff -r 5759ef3a98b8 -r 893b1f7b6690 include/utmp.h --- a/include/utmp.h Mon May 20 15:21:44 2019 -0400 +++ b/include/utmp.h Mon May 20 12:59:45 2019 -0400 @@ -47,8 +47,8 @@ #endif #if !defined(_XPG4_2) || defined(__EXTENSIONS__) -#define UTMP_FILE "/var/adm/utmp" -#define WTMP_FILE "/var/adm/wtmp" +#define UTMP_FILE "/var/log/utmp" +#define WTMP_FILE "/var/log/wtmp" #endif #define ut_name ut_user diff -r 5759ef3a98b8 -r 893b1f7b6690 include/utmpx.h --- a/include/utmpx.h Mon May 20 15:21:44 2019 -0400 +++ b/include/utmpx.h Mon May 20 12:59:45 2019 -0400 @@ -46,8 +46,8 @@ extern "C" { #endif -#define _UTMPX_FILE "/var/adm/utmpx" -#define _WTMPX_FILE "/var/adm/wtmpx" +#define _UTMPX_FILE "/var/log/utmpx" +#define _WTMPX_FILE "/var/log/wtmpx" #if !defined(_XPG4_2) || defined(__EXTENSIONS__) #define UTMPX_FILE _UTMPX_FILE #define WTMPX_FILE _WTMPX_FILE diff -r 5759ef3a98b8 -r 893b1f7b6690 kernel/drivers/net/nxge/nxge_ipp.c --- a/kernel/drivers/net/nxge/nxge_ipp.c Mon May 20 15:21:44 2019 -0400 +++ b/kernel/drivers/net/nxge/nxge_ipp.c Mon May 20 12:59:45 2019 -0400 @@ -436,7 +436,7 @@ if (istatus.bits.w0.bad_cksum_cnt_ovfl) { /* * Do not send FMA ereport or log error message - * in /var/adm/messages because this error does not + * in /var/log/messages because this error does not * indicate a HW failure. * * Clear bit BAD_CS_MX of register IPP_INT_STAT @@ -448,7 +448,7 @@ if (istatus.bits.w0.pkt_discard_cnt_ovfl) { /* * Do not send FMA ereport or log error message - * in /var/adm/messages because this error does not + * in /var/log/messages because this error does not * indicate a HW failure. * * Clear bit PKT_DIS_MX of register IPP_INT_STAT diff -r 5759ef3a98b8 -r 893b1f7b6690 kernel/drivers/scsi/targets/sd/sd.c --- a/kernel/drivers/scsi/targets/sd/sd.c Mon May 20 15:21:44 2019 -0400 +++ b/kernel/drivers/scsi/targets/sd/sd.c Mon May 20 12:59:45 2019 -0400 @@ -7616,9 +7616,9 @@ /* * If enter here, it should be non-CDROM and FM-capable * device, and it will not keep the old scsi_log as before - * in /var/adm/messages. However, the property + * in /var/log/messages. However, the property * "fm-scsi-log" will control whether the FM telemetry will - * be logged in /var/adm/messages. + * be logged in /var/log/messages. */ int fm_scsi_log; fm_scsi_log = ddi_prop_get_int(DDI_DEV_T_ANY, SD_DEVINFO(un), diff -r 5759ef3a98b8 -r 893b1f7b6690 kernel/fs/nfs/nfs4_client_debug.c --- a/kernel/fs/nfs/nfs4_client_debug.c Mon May 20 15:21:44 2019 -0400 +++ b/kernel/fs/nfs/nfs4_client_debug.c Mon May 20 12:59:45 2019 -0400 @@ -861,7 +861,7 @@ } /* - * Print an event message to /var/adm/messages + * Print an event message to /var/log/messages * The last argument to this fuction dictates the repeat status * of the event. If set to 1, it means that we are dumping this * event and it will _never_ be printed after this time. Else if @@ -1081,7 +1081,7 @@ } /* - * Print a fact message to /var/adm/messages + * Print a fact message to /var/log/messages */ static void queue_print_fact(nfs4_debug_msg_t *msg, int dump) diff -r 5759ef3a98b8 -r 893b1f7b6690 kernel/os/sunmdi.c --- a/kernel/os/sunmdi.c Mon May 20 15:21:44 2019 -0400 +++ b/kernel/os/sunmdi.c Mon May 20 12:59:45 2019 -0400 @@ -4861,7 +4861,7 @@ /* * NOTE: Keeping "multipath status: %s" and * "Load balancing: %s" format unchanged in case someone - * scrubs /var/adm/messages looking for these messages. + * scrubs /var/log/messages looking for these messages. */ if (report_lb_c && report_lb_p) { if (ct->ct_lb == LOAD_BALANCE_LBA) { diff -r 5759ef3a98b8 -r 893b1f7b6690 libexec/unleashed/utmp_update/utmp_update.c --- a/libexec/unleashed/utmp_update/utmp_update.c Mon May 20 15:21:44 2019 -0400 +++ b/libexec/unleashed/utmp_update/utmp_update.c Mon May 20 12:59:45 2019 -0400 @@ -24,7 +24,7 @@ */ /* - * utmp_update - Update the /var/adm/utmpx file + * utmp_update - Update the /var/log/utmpx file * * As of on28, the utmp interface is obsolete, * so we only handle updating the utmpx file now. @@ -33,7 +33,7 @@ * * This program runs set uid root on behalf of * non-privileged user programs. Normal programs cannot - * write to /var/adm/utmpx. Non-root callers of pututxline + * write to /var/log/utmpx. Non-root callers of pututxline * will invoke this program to write the utmpx entry. */ diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/acctcom.1 --- a/share/man/man1/acctcom.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/acctcom.1 Mon May 20 12:59:45 2019 -0400 @@ -20,7 +20,7 @@ .sp .LP The \fBacctcom\fR utility reads \fIfilename\fRs, the standard input, or -\fB/var/adm/pacct\fR, in the form described by \fBacct.h\fR(3HEAD) and writes +\fB/var/log/pacct\fR, in the form described by \fBacct.h\fR(3HEAD) and writes selected records to standard output. Each record represents the execution of one process. The output shows the \fBCOMMAND NAME\fR, \fBUSER\fR, \fBTTYNAME\fR, \fBSTART TIME\fR, \fBEND TIME\fR, \fBREAL (SEC)\fR, \fBCPU @@ -38,15 +38,15 @@ .LP If no \fIfilename\fR is specified, and if the standard input is associated with a terminal or \fB/dev/null\fR (as is the case when using `\fB&\fR\&' in -the shell), \fB/var/adm/pacct\fR is read; otherwise, the standard input is +the shell), \fB/var/log/pacct\fR is read; otherwise, the standard input is read. .sp .LP If any \fIfilename\fR arguments are given, they are read in their respective order. Each file is normally read forward, that is, in chronological order by -process completion time. The file \fB/var/adm/pacct\fR is usually the current +process completion time. The file \fB/var/log/pacct\fR is usually the current file to be examined; a busy system may need several such files of which all but -the current file are found in \fB/var/adm/pacct\fIincr\fR\fR. +the current file are found in \fB/var/log/pacct\fIincr\fR\fR. .SH OPTIONS .sp .LP @@ -307,7 +307,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/pacct\fIincr\fR\fR\fR +\fB\fB/var/log/pacct\fIincr\fR\fR\fR .ad .RS 22n active processes accounting file diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/finger.1 --- a/share/man/man1/finger.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/finger.1 Mon May 20 12:59:45 2019 -0400 @@ -270,7 +270,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/lastlog.v2\fR \fR +\fB\fB/var/log/lastlog.v2\fR \fR .ad .RS 24n time of last login @@ -279,7 +279,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR \fR +\fB\fB/var/log/utmpx\fR \fR .ad .RS 24n accounting diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/last.1 --- a/share/man/man1/last.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/last.1 Mon May 20 12:59:45 2019 -0400 @@ -17,7 +17,7 @@ .SH DESCRIPTION .LP -The \fBlast\fR command looks in the \fB/var/adm/wtmpx\fR file, which records +The \fBlast\fR command looks in the \fB/var/log/wtmpx\fR file, which records all logins and logouts, for information about a user, a terminal, or any group of users and terminals. Arguments specify names of users or terminals of interest. If multiple arguments are given, the information applicable to any of @@ -51,7 +51,7 @@ .sp .LP If \fBlast\fR is interrupted, it indicates how far the search has progressed in -\fB/var/adm/wtmpx\fR. If interrupted with a quit signal (generated by a +\fB/var/log/wtmpx\fR. If interrupted with a quit signal (generated by a CTRL\(mi\e), \fBlast\fR indicates how far the search has progressed, and then continues the search. .SH OPTIONS @@ -82,7 +82,7 @@ .ad .RS 25n Uses \fIfilename\fR as the name of the accounting file instead of -\fB/var/adm/wtmpx\fR. +\fB/var/log/wtmpx\fR. .RE .sp @@ -103,7 +103,7 @@ .SH FILES .ne 2 .na -\fB\fB/var/adm/wtmpx\fR\fR +\fB\fB/var/log/wtmpx\fR\fR .ad .RS 18n accounting file diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/lastcomm.1 --- a/share/man/man1/lastcomm.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/lastcomm.1 Mon May 20 12:59:45 2019 -0400 @@ -159,7 +159,7 @@ .SH FILES .ne 2 .na -\fB\fB/var/adm/pacct\fR\fR +\fB\fB/var/log/pacct\fR\fR .ad .RS 24n standard accounting file @@ -168,7 +168,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/exacct/proc\fR\fR +\fB\fB/var/log/exacct/proc\fR\fR .ad .RS 24n extended accounting file diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/login.1 --- a/share/man/man1/login.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/login.1 Mon May 20 12:59:45 2019 -0400 @@ -58,7 +58,7 @@ .sp .LP is printed and a new login prompt appears. If you make five incorrect login -attempts, all five can be logged in \fB/var/adm/loginlog\fR, if it exists. The +attempts, all five can be logged in \fB/var/log/loginlog\fR, if it exists. The \fBTTY\fR line is dropped. .sp .LP @@ -375,7 +375,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/lastlog\fR\fR +\fB\fB/var/log/lastlog\fR\fR .ad .RS 23n Time of last login. @@ -384,7 +384,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/loginlog\fR\fR +\fB\fB/var/log/loginlog\fR\fR .ad .RS 23n Record of failed login attempts. @@ -393,7 +393,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .RS 23n Accounting. @@ -402,7 +402,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/wtmpx\fR\fR +\fB\fB/var/log/wtmpx\fR\fR .ad .RS 23n Accounting. diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/logname.1 --- a/share/man/man1/logname.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/logname.1 Mon May 20 12:59:45 2019 -0400 @@ -114,7 +114,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .RS 18n user and accounting information diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/mpss.so.1.1 --- a/share/man/man1/mpss.so.1.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/mpss.so.1.1 Mon May 20 12:59:45 2019 -0400 @@ -145,7 +145,7 @@ .LP If the desired page size is not configured (shown in the \fBpmap\fR output), it may be due to errors in the \fBMPSS\fR configuration file or environment -variables. Check the error log (by default: \fB/var/adm/messages\fR) for +variables. Check the error log (by default: \fB/var/log/messages\fR) for errors. .sp diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/sar.1 --- a/share/man/man1/sar.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/sar.1 Mon May 20 12:59:45 2019 -0400 @@ -34,7 +34,7 @@ In the second instance, no sampling interval is specified. \fBsar\fR extracts data from a previously recorded \fIfilename\fR, either the one specified by the \fB-f\fR option or, by default, the standard system activity daily data file -\fB/var/adm/sa/sa\fIdd\fR\fR for the current day \fIdd\fR. The starting and +\fB/var/log/sa/sa\fIdd\fR\fR for the current day \fIdd\fR. The starting and ending times of the report can be bounded using the \fB-e\fR and \fB-s\fR arguments with \fItime\fR specified in the form \fIhh\fR[:\fImm\fR[:\fIss\fR]]. The \fB-i\fR option selects records at \fIsec\fR second intervals. Otherwise, @@ -224,7 +224,7 @@ .ad .RS 15n Uses \fIfilename\fR as the data source for \fBsar\fR. Default is the current -daily data file \fB/var/adm/sa/sa\fR\fIdd.\fR +daily data file \fB/var/log/sa/sa\fR\fIdd.\fR .RE .sp @@ -663,7 +663,7 @@ .SH FILES .ne 2 .na -\fB\fB/var/adm/sa/sa\fIdd\fR\fR\fR +\fB\fB/var/log/sa/sa\fIdd\fR\fR\fR .ad .RS 20n daily data file, where \fIdd\fR are digits representing the day of the month diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/spell.1 --- a/share/man/man1/spell.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/spell.1 Mon May 20 12:59:45 2019 -0400 @@ -259,7 +259,7 @@ .sp .ne 2 .na -\fB\fBH_SPELL=/var/adm/spellhist\fR\fR +\fB\fBH_SPELL=/var/log/spellhist\fR\fR .ad .sp .6 .RS 4n diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/talk.1 --- a/share/man/man1/talk.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/talk.1 Mon May 20 12:59:45 2019 -0400 @@ -252,7 +252,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .RS 18n user and accounting information for \fBtalk\fR diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/timex.1 --- a/share/man/man1/timex.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/timex.1 Mon May 20 12:59:45 2019 -0400 @@ -157,6 +157,6 @@ .sp .LP Process records associated with \fBcommand\fR are selected from the accounting -file \fB/var/adm/pacct\fR by inference, since process genealogy is not +file \fB/var/log/pacct\fR by inference, since process genealogy is not available. Background processes having the same user ID, terminal ID, and execution time window will be spuriously included. diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/tip.1 --- a/share/man/man1/tip.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/tip.1 Mon May 20 12:59:45 2019 -0400 @@ -572,7 +572,7 @@ .ad .RS 16n (str) The name of the file to which to log information about outgoing phone -calls. \fBlog\fR is initially set to \fB/var/adm/aculog\fR, and can only be +calls. \fBlog\fR is initially set to \fB/var/log/aculog\fR, and can only be inspected or changed by the super-user. .RE @@ -912,7 +912,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/aculog\fR\fR +\fB\fB/var/log/aculog\fR\fR .ad .RS 29n file in which outgoing calls are logged diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/users.1 --- a/share/man/man1/users.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/users.1 Mon May 20 12:59:45 2019 -0400 @@ -20,7 +20,7 @@ .sp .LP Specifying \fIfilename\fR tells \fBusers\fR where to find its information; by -default it checks \fB/var/adm/utmpx\fR. +default it checks \fB/var/log/utmpx\fR. .sp .LP Typing \fBusers\fR is equivalent to typing \fBwho\fR \fB-q\fR. @@ -40,7 +40,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .RS 18n diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/w.1 --- a/share/man/man1/w.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/w.1 Mon May 20 12:59:45 2019 -0400 @@ -124,7 +124,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .RS 18n user and accounting information diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/who.1 --- a/share/man/man1/who.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/who.1 Mon May 20 12:59:45 2019 -0400 @@ -78,9 +78,9 @@ The \fBwho\fR utility can list the user's name, terminal line, login time, elapsed time since activity occurred on the line, and the process-ID of the command interpreter (shell) for each current UNIX system user. It examines the -\fB/var/adm/utmpx\fR file to obtain its information. If \fIfile\fR is given, +\fB/var/log/utmpx\fR file to obtain its information. If \fIfile\fR is given, that file (which must be in \fButmpx\fR(4) format) is examined. Usually, -\fIfile\fR will be \fB/var/adm/wtmpx\fR, which contains a history of all the +\fIfile\fR will be \fB/var/log/wtmpx\fR, which contains a history of all the logins since the file was last created. .sp .LP @@ -177,7 +177,7 @@ \fB\fB-a\fR \fR .ad .RS 9n -Processes \fB/var/adm/utmpx\fR or the named \fIfile\fR with \fB-b\fR, \fB-d\fR, +Processes \fB/var/log/utmpx\fR or the named \fIfile\fR with \fB-b\fR, \fB-d\fR, \fB-l\fR, \fB-p\fR, \fB-r\fR, \fB-t\fR, \fB-T\fR, and \fB-u\fR options turned on. .RE @@ -395,7 +395,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR \fR +\fB\fB/var/log/utmpx\fR \fR .ad .RS 19n Current user and accounting information @@ -404,7 +404,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/wtmpx\fR \fR +\fB\fB/var/log/wtmpx\fR \fR .ad .RS 19n Historic user and accounting information @@ -430,6 +430,6 @@ .SH NOTES .LP \fBSuperuser:\fR After a shutdown to the single-user state, \fBwho\fR returns a -prompt. Since \fB/var/adm/utmpx\fR is updated at login time and there is no +prompt. Since \fB/var/log/utmpx\fR is updated at login time and there is no login in single-user state, \fBwho\fR cannot report accurately on this state. The command, \fBwho\fR \fBam i\fR, however, returns the correct information. diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man1/write.1 --- a/share/man/man1/write.1 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man1/write.1 Mon May 20 12:59:45 2019 -0400 @@ -142,7 +142,7 @@ To write to a user who is logged in more than once, the \fIterminal\fR argument can be used to indicate which terminal to write to. Otherwise, the recipient's terminal is the first writable instance of the user found in -\fB/var/adm/utmpx\fR, and the following informational message will be written +\fB/var/log/utmpx\fR, and the following informational message will be written to the sender's standard output, indicating which terminal was chosen: .sp .in +2 @@ -232,7 +232,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .RS 18n User and accounting information for \fBwrite\fR diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man3c/getlogin.3c --- a/share/man/man3c/getlogin.3c Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man3c/getlogin.3c Mon May 20 12:59:45 2019 -0400 @@ -65,7 +65,7 @@ .sp .LP The \fBgetlogin()\fR function returns a pointer to the login name as found in -\fB/var/adm/utmpx\fR. It can be used in conjunction with \fBgetpwnam\fR(3C) to +\fB/var/log/utmpx\fR. It can be used in conjunction with \fBgetpwnam\fR(3C) to locate the correct password file entry when the same user \fBID\fR is shared by several login names. .sp @@ -114,7 +114,7 @@ \fB\fBEINVAL\fR\fR .ad .RS 10n -And entry for the current user was not found in the \fB/var/adm/utmpx\fR file. +And entry for the current user was not found in the \fB/var/log/utmpx\fR file. .RE .sp @@ -176,7 +176,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .RS 18n user access and administration information diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man3c/getutxent.3c --- a/share/man/man3c/getutxent.3c Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man3c/getutxent.3c Mon May 20 12:59:45 2019 -0400 @@ -156,8 +156,8 @@ .SS "\fButmpxname()\fR" .LP The \fButmpxname()\fR function allows the user to change the name of the -database file examined from \fB/var/adm/utmpx\fR to any other file, most often -\fB/var/adm/wtmpx\fR. If the file does not exist, this will not be apparent +database file examined from \fB/var/log/utmpx\fR to any other file, most often +\fB/var/log/wtmpx\fR. If the file does not exist, this will not be apparent until the first attempt to reference the file is made. The \fButmpxname()\fR function does not open the file, but closes the old file if it is currently open and saves the new file name. The new file name must end with the "x" @@ -181,14 +181,14 @@ The \fBupdwtmp()\fR function can be used in two ways. .sp .LP -If \fIwfile\fR is \fB/var/adm/wtmp\fR, the \fButmp\fR format record supplied by +If \fIwfile\fR is \fB/var/log/wtmp\fR, the \fButmp\fR format record supplied by the caller is converted to a \fButmpx \fRformat record and the -\fB/var/adm/wtmpx\fR file is updated (because the \fB/var/adm/wtmp\fR file no +\fB/var/log/wtmpx\fR file is updated (because the \fB/var/log/wtmp\fR file no longer exists, operations on \fBwtmp\fR are converted to operations on \fBwtmpx\fR by the library functions. .sp .LP -If \fIwfile\fR is a file other than \fB/var/adm/wtmp\fR, it is assumed to be an +If \fIwfile\fR is a file other than \fB/var/log/wtmp\fR, it is assumed to be an old file in \fButmp\fR format and is updated directly with the \fButmp\fR format record supplied by the caller. .SS "\fBupdwtmpx()\fR" @@ -265,7 +265,7 @@ .SH FILES .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .RS 18n user access and accounting information @@ -274,7 +274,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/wtmpx\fR\fR +\fB\fB/var/log/wtmpx\fR\fR .ad .RS 18n history of user access and accounting information diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man3c/ttyslot.3c --- a/share/man/man3c/ttyslot.3c Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man3c/ttyslot.3c Mon May 20 12:59:45 2019 -0400 @@ -18,7 +18,7 @@ .sp .LP The \fBttyslot()\fR function returns the index of the current user's entry in -the user accounting database, \fB/var/adm/utmpx\fR. The current user's entry is +the user accounting database, \fB/var/log/utmpx\fR. The current user's entry is an entry for which the \fButline\fR member matches the name of a terminal device associated with any of the process's file descriptors 0, 1 or 2. The index is an ordinal number representing the record number in the database of @@ -35,7 +35,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .RS 18n user access and accounting information diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man3exacct/ea_open.3exacct --- a/share/man/man3exacct/ea_open.3exacct Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man3exacct/ea_open.3exacct Mon May 20 12:59:45 2019 -0400 @@ -116,7 +116,7 @@ #include ea_file_t ef; -if (ea_open(&ef, "/var/adm/exacct/proc", NULL, EO_HEAD, +if (ea_open(&ef, "/var/log/exacct/proc", NULL, EO_HEAD, O_RDONLY, 0) == -1) exit(1); (void) ea_close(&ef); diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man3lib/libpool.3lib --- a/share/man/man3lib/libpool.3lib Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man3lib/libpool.3lib Mon May 20 12:59:45 2019 -0400 @@ -156,7 +156,7 @@ The \fBsystem.poold.history-file\fR specifies the location of the decision history file which is used by \fBpoold\fR to improve the quality of its decision making over time. If this property is not specified, the default -location \fB/var/adm/pool\fR is used. +location \fB/var/log/pool\fR is used. .sp .LP The \fBsystem.poold.monitor-interval\fR property specifies the monitoring diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man4/loginlog.4 --- a/share/man/man4/loginlog.4 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man4/loginlog.4 Mon May 20 12:59:45 2019 -0400 @@ -10,7 +10,7 @@ .sp .LP After five unsuccessful login attempts, all the attempts are logged in the file -\fB/var/adm/loginlog\fR. This file contains one record for each failed attempt. +\fB/var/log/loginlog\fR. This file contains one record for each failed attempt. Each record contains the login name, tty specification, and time. .sp .LP @@ -25,7 +25,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/loginlog\fR\fR +\fB\fB/var/log/loginlog\fR\fR .ad .RS 21n diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man4/shadow.4 --- a/share/man/man4/shadow.4 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man4/shadow.4 Mon May 20 12:59:45 2019 -0400 @@ -178,7 +178,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/lastlog.v2\fR\fR +\fB\fB/var/log/lastlog.v2\fR\fR .ad .RS 22n time of last login diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man4/sulog.4 --- a/share/man/man4/sulog.4 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man4/sulog.4 Mon May 20 12:59:45 2019 -0400 @@ -10,7 +10,7 @@ .SH SYNOPSIS .LP .nf -\fB/var/adm/sulog\fR +\fB/var/log/sulog\fR .fi .SH DESCRIPTION @@ -118,7 +118,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/sulog\fR\fR +\fB\fB/var/log/sulog\fR\fR .ad .RS 19n su log file diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man4/utmp.4 --- a/share/man/man4/utmp.4 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man4/utmp.4 Mon May 20 12:59:45 2019 -0400 @@ -10,8 +10,8 @@ .LP .nf \fB#include \fR -\fB/var/adm/utmp\fR -\fB/var/adm/wtmp\fR +\fB/var/log/utmp\fR +\fB/var/log/wtmp\fR .fi .SH DESCRIPTION @@ -23,7 +23,7 @@ \fButmpx\fR(4). .sp .LP -It is possible for \fB/var/adm/utmp\fR to reappear on the system. This would +It is possible for \fB/var/log/utmp\fR to reappear on the system. This would most likely occur if a third party application that still uses \fButmp\fR recreates the file if it finds it missing. This file should not be allowed to remain on the system. The user should investigate to determine which diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man4/utmpx.4 --- a/share/man/man4/utmpx.4 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man4/utmpx.4 Mon May 20 12:59:45 2019 -0400 @@ -11,8 +11,8 @@ .LP .nf \fB#include \fR -\fB/var/adm/utmpx\fR -\fB/var/adm/wtmpx\fR +\fB/var/log/utmpx\fR +\fB/var/log/wtmpx\fR .fi .SH DESCRIPTION @@ -34,7 +34,7 @@ .SH FILES .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .RS 18n user access and administration information @@ -43,7 +43,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/wtmpx\fR\fR +\fB\fB/var/log/wtmpx\fR\fR .ad .RS 18n history of user access and administrative information diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man4/warn.conf.4 --- a/share/man/man4/warn.conf.4 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man4/warn.conf.4 Mon May 20 12:59:45 2019 -0400 @@ -109,7 +109,7 @@ .RS 17n Sends the warnings to the system's syslog. Depending on the \fB/etc/syslog.conf\fR file, syslog entries are written to the -\fB/var/adm/messages\fR file and/or displayed on the terminal. +\fB/var/log/messages\fR file and/or displayed on the terminal. .RE .sp diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man5/filesystem.5 --- a/share/man/man5/filesystem.5 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man5/filesystem.5 Mon May 20 12:59:45 2019 -0400 @@ -891,16 +891,6 @@ .sp .ne 2 .na -\fB\fB/var/adm\fR\fR -.ad -.sp .6 -.RS 4n -System logging and accounting files. -.RE - -.sp -.ne 2 -.na \fB\fB/var/audit\fR\fR .ad .sp .6 @@ -1005,7 +995,7 @@ .ad .sp .6 .RS 4n -System log files. +System log files and accounting files. .RE .sp diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man5/pam_unix_session.5 --- a/share/man/man5/pam_unix_session.5 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man5/pam_unix_session.5 Mon May 20 12:59:45 2019 -0400 @@ -20,7 +20,7 @@ and \fBpam_sm_close_session\fR(3PAM). .sp .LP -\fBpam_sm_open_session()\fR reads \fB/var/adm/lastlog.v2\fR to report the +\fBpam_sm_open_session()\fR reads \fB/var/log/lastlog.v2\fR to report the user's last login time via a PAM_TEXT_INFO message as well as updates the file with information contained in the \fBPAM_USER\fR, \fBPAM_TTY\fR, and \fBPAM_RHOSTS\fR items. \fBpam_unix_account\fR(5) also uses this file to diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man7d/ata.7d --- a/share/man/man7d/ata.7d Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man7d/ata.7d Mon May 20 12:59:45 2019 -0400 @@ -252,7 +252,7 @@ .sp To determine the string to substitute for , boot your system (you may have to press the reset button or power-cycle) and then view -\fB/var/adm/messages\fR. Look for the string "IDE device at targ" or "ATAPI +\fB/var/log/messages\fR. Look for the string "IDE device at targ" or "ATAPI device at targ." The next line will contain the word "model" followed by the model number and a comma. Ignore all characters except letters, digits, ".", "_", and "-". Change uppercase letters to lower case. If the string @@ -284,7 +284,7 @@ .sp .LP -Output of \fB/var/adm/messages\fR: +Output of \fB/var/log/messages\fR: .sp .in +2 diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man7d/ugen.7d --- a/share/man/man7d/ugen.7d Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man7d/ugen.7d Mon May 20 12:59:45 2019 -0400 @@ -52,7 +52,7 @@ device types being managed by the driver. .sp .LP -Names used to bind drivers can be found in \fB/var/adm/messages\fR. When a +Names used to bind drivers can be found in \fB/var/log/messages\fR. When a device is on-lined after hot insertion, and no driver is found, there will be an entry containing: .sp diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man7p/ipsec.7p --- a/share/man/man7p/ipsec.7p Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man7p/ipsec.7p Mon May 20 12:59:45 2019 -0400 @@ -128,7 +128,7 @@ \fBipsec_policy_log_interval\fR .ad .RS 30n -IPsec logs policy failures and errors to \fB/var/adm/messages\fR. To prevent +IPsec logs policy failures and errors to \fB/var/log/messages\fR. To prevent syslog from being overloaded, the IPsec kernel modules limit the rate at which errors can be logged. You can query/set ipsec_policy_log_interval using \fBndd\fR(8). The value is in milliseconds. Only one message can be logged per diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/acct.8 --- a/share/man/man8/acct.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/acct.8 Mon May 20 12:59:45 2019 -0400 @@ -48,14 +48,14 @@ .sp .LP Connect time accounting is handled by various programs that write records into -\fB/var/adm/wtmpx\fR, as described in \fButmpx\fR(4). The programs described in +\fB/var/log/wtmpx\fR, as described in \fButmpx\fR(4). The programs described in \fBacctcon\fR(8) convert this file into session and charging records, which are then summarized by \fBacctmerg\fR(8). .sp .LP Process accounting is performed by the system kernel. Upon termination of a process, one record per process is written to a file (normally -\fB/var/adm/pacct\fR). The programs in \fBacctprc\fR(8) summarize this data +\fB/var/log/pacct\fR). The programs in \fBacctprc\fR(8) summarize this data for charging purposes; \fBacctcms\fR(8) is used to summarize command usage. Current process data may be examined using \fBacctcom\fR(1). .sp @@ -92,23 +92,23 @@ .sp .in +2 .nf -acctwtmp "acctg on" /var/adm/wtmpx -acctwtmp "acctg off" /var/adm/wtmpx +acctwtmp "acctg on" /var/log/wtmpx +acctwtmp "acctg off" /var/log/wtmpx .fi .in -2 .sp .LP For each user currently logged on, \fBclosewtmp\fR puts a false -\fBDEAD_PROCESS\fR record in the \fB/var/adm/wtmpx\fR file. \fBrunacct\fR (see +\fBDEAD_PROCESS\fR record in the \fB/var/log/wtmpx\fR file. \fBrunacct\fR (see \fBrunacct\fR(8)) uses this false \fBDEAD_PROCESS\fR record so that the connect accounting procedures can track the time used by users logged on before \fBrunacct\fR was invoked. .sp .LP For each user currently logged on, \fBrunacct\fR uses \fButmp2wtmp\fR to create -an entry in the file \fB/var/adm/wtmpx\fR, created by \fBrunacct\fR. Entries in -\fB/var/adm/wtmpx\fR enable subsequent invocations of \fBrunacct\fR to account +an entry in the file \fB/var/log/wtmpx\fR, created by \fBrunacct\fR. Entries in +\fB/var/log/wtmpx\fR enable subsequent invocations of \fBrunacct\fR to account for connect times of users currently logged in. .SH OPTIONS .sp @@ -192,7 +192,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/pacct\fR\fR +\fB\fB/var/log/pacct\fR\fR .ad .RS 18n Current process accounting file. @@ -201,7 +201,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/wtmpx\fR\fR +\fB\fB/var/log/wtmpx\fR\fR .ad .RS 18n History of user access and administration information.. diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/acctadm.8 --- a/share/man/man8/acctadm.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/acctadm.8 Mon May 20 12:59:45 2019 -0400 @@ -195,7 +195,7 @@ .nf $ \fBacctadm\fR Task accounting: active - Task accounting file: /var/adm/exacct/task + Task accounting file: /var/log/exacct/task Tracked task resources: extended Untracked task resources: host Process accounting: inactive @@ -223,7 +223,7 @@ .sp .in +2 .nf -$ \fBacctadm -e basic -f /var/adm/exacct/proc process\fR +$ \fBacctadm -e basic -f /var/log/exacct/proc process\fR .fi .in -2 .sp diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/acctcon.8 --- a/share/man/man8/acctcon.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/acctcon.8 Mon May 20 12:59:45 2019 -0400 @@ -27,17 +27,17 @@ .LP \fBacctcon\fR converts a sequence of login/logoff records to total accounting records (see the \fBtacct\fR format in \fBacct.h\fR(3HEAD)). The login/logoff -records are read from standard input. The file \fB/var/adm/wtmpx\fR is usually +records are read from standard input. The file \fB/var/log/wtmpx\fR is usually the source of the login/logoff records; however, because it might contain corrupted records or system date changes, it should first be fixed using -\fBwtmpfix\fR. The fixed version of file \fB/var/adm/wtmpx\fR can then be +\fBwtmpfix\fR. The fixed version of file \fB/var/log/wtmpx\fR can then be redirected to \fBacctcon\fR. The \fBtacct\fR records are written to standard output. .sp .LP \fBacctcon\fR is a combination of the programs \fBacctcon1\fR and \fBacctcon2\fR. \fBacctcon1\fR converts login/logoff records, taken from the -fixed \fB/var/adm/wtmpx\fR file, to ASCII output. \fBacctcon2\fR reads the +fixed \fB/var/log/wtmpx\fR file, to ASCII output. \fBacctcon2\fR reads the ASCII records produced by \fBacctcon1\fR and converts them to \fBtacct\fR records. \fBacctcon1\fR can be used with the \fB-l\fR and \fB-o\fR options, described below, as well as with the \fB-p\fR and \fB-t\fR options. @@ -124,7 +124,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/wtmpx\fR\fR +\fB\fB/var/log/wtmpx\fR\fR .ad .RS 18n History of user access and administration information @@ -144,7 +144,7 @@ .sp .LP The line usage report is confused by date changes. Use \fBwtmpfix\fR (see -\fBfwtmp\fR(8)), with the \fB/var/adm/wtmpx\fR file as an argument, to correct +\fBfwtmp\fR(8)), with the \fB/var/log/wtmpx\fR file as an argument, to correct this situation. .sp .LP diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/acctprc.8 --- a/share/man/man8/acctprc.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/acctprc.8 Mon May 20 12:59:45 2019 -0400 @@ -56,7 +56,7 @@ .sp .in +2 .nf -example% acctprc \|< /var/adm/pacct \|> ptacct +example% acctprc \|< /var/log/pacct \|> ptacct .fi .in -2 .sp @@ -69,7 +69,7 @@ .sp .in +2 .nf -example% acctprc1 \|ctmp \| ptacct .fi .in -2 diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/acctsh.8 --- a/share/man/man8/acctsh.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/acctsh.8 Mon May 20 12:59:45 2019 -0400 @@ -74,13 +74,13 @@ .sp .LP \fBchargefee\fR can be invoked to charge a \fInumber\fR of units to -\fIlogin-name\fR. A record is written to \fB/var/adm/fee\fR, to be merged with +\fIlogin-name\fR. A record is written to \fB/var/log/fee\fR, to be merged with other accounting records by \fBrunacct\fR(8). .SS "ckpacct Command" .sp .LP \fBckpacct\fR should be initiated using \fBcron\fR(8) to periodically check -the size of \fB/var/adm/pacct\fR. If the size exceeds \fIblocks\fR, \fB500\fR +the size of \fB/var/log/pacct\fR. If the size exceeds \fIblocks\fR, \fB500\fR by default, \fBturnacct\fR will be invoked with argument \fBswitch\fR. To avoid a conflict with \fBturnacct switch\fR execution in \fBrunacct\fR, do not run \fBckpacct\fR and \fBrunacct\fR simultaneously. If the number of free disk @@ -99,7 +99,7 @@ .sp .LP \fBlastlogin\fR is invoked by \fBrunacct\fR(8) to update -\fB/var/adm/acct/sum/loginlog\fR, which shows the last date on which each +\fB/var/log/acct/sum/loginlog\fR, which shows the last date on which each person logged in. .SS "monacct Command" .sp @@ -108,8 +108,8 @@ \fInumber\fR indicates which month or period it is. If \fInumber\fR is not given, it defaults to the current month (01\(mi12). This default is useful if \fBmonacct\fR is to executed using \fBcron\fR(8) on the first day of each -month. \fBmonacct\fR creates summary files in \fB/var/adm/acct/fiscal\fR and -restarts the summary files in \fB/var/adm/acct/sum\fR. +month. \fBmonacct\fR creates summary files in \fB/var/log/acct/fiscal\fR and +restarts the summary files in \fB/var/log/acct/sum\fR. .SS "nulladm Command" .sp .LP @@ -119,14 +119,14 @@ .sp .LP \fBprctmp\fR can be used to print the session record file (normally -\fB/var/adm/acct/nite/ctmp\fR created by \fBacctcon1\fR (see +\fB/var/log/acct/nite/ctmp\fR created by \fBacctcon1\fR (see \fBacctcon\fR(8)). .SS "prdaily Command" .sp .LP \fBprdaily\fR is invoked by \fBrunacct\fR(8) to format a report of the previous day's accounting data. The report resides in -\fB/var/adm/acct/sum/rprt/mmdd\fR where \fImmdd\fR is the month and day of the +\fB/var/log/acct/sum/rprt/mmdd\fR where \fImmdd\fR is the month and day of the report. The current daily accounting reports may be printed by typing \fBprdaily\fR. Previous days' accounting reports can be printed by using the \fImmdd\fR option and specifying the exact report date desired. @@ -139,7 +139,7 @@ .sp .LP \fBshutacct\fR is invoked during a system shutdown to turn process accounting -off and append a \fIreason\fR record to \fB/var/adm/wtmpx\fR. +off and append a \fIreason\fR record to \fB/var/log/wtmpx\fR. .SS "startup Command" .sp .LP @@ -150,8 +150,8 @@ .LP \fBturnacct\fR is an interface to \fBaccton\fR (see \fBacct\fR(8)) to turn process accounting \fBon\fR or \fBoff\fR. The \fBswitch\fR argument moves the -current \fB/var/adm/pacct\fR to the next free name in -\fB/var/adm/pacct.\fIincr\fR\fR (where \fIincr\fR is a number starting with +current \fB/var/log/pacct\fR to the next free name in +\fB/var/log/pacct.\fIincr\fR\fR (where \fIincr\fR is a number starting with \fB0\fR and incrementing by one for each additional \fBpacct\fR file), then turns accounting back on again. This procedure is called by \fBckpacct\fR and thus can be taken care of by the \fBcron\fR(8) command and used to keep \fB @@ -238,7 +238,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/acct/fiscal\fR\fR +\fB\fB/var/log/acct/fiscal\fR\fR .ad .RS 30n Fiscal reports directory @@ -247,7 +247,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/acct/nite\fR\fR +\fB\fB/var/log/acct/nite\fR\fR .ad .RS 30n Working directory @@ -256,7 +256,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/acct/sum\fR\fR +\fB\fB/var/log/acct/sum\fR\fR .ad .RS 30n Summary directory that contains information for \fBmonacct\fR @@ -265,7 +265,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/acct/sum/loginlog\fR\fR +\fB\fB/var/log/acct/sum/loginlog\fR\fR .ad .RS 30n File updated by last login @@ -274,7 +274,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/fee\fR\fR +\fB\fB/var/log/fee\fR\fR .ad .RS 30n Accumulator for fees @@ -283,7 +283,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/pacct\fR\fR +\fB\fB/var/log/pacct\fR\fR .ad .RS 30n Current file for per-process accounting @@ -292,7 +292,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/pacct\fR\fIincr\fR\fR +\fB\fB/var/log/pacct\fR\fIincr\fR\fR .ad .RS 30n Used if \fBpacct\fR gets large and during execution of daily accounting @@ -302,7 +302,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/wtmpx\fR\fR +\fB\fB/var/log/wtmpx\fR\fR .ad .RS 30n History of user access and administration information diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/fwtmp.8 --- a/share/man/man8/fwtmp.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/fwtmp.8 Mon May 20 12:59:45 2019 -0400 @@ -21,7 +21,7 @@ .sp .LP \fBfwtmp\fR reads from the standard input and writes to the standard output, -converting binary records of the type found in \fB/var/adm/wtmpx\fR to +converting binary records of the type found in \fB/var/log/wtmpx\fR to formatted ASCII records. The ASCII version is useful when it is necessary to edit bad records. .sp @@ -34,7 +34,7 @@ .sp .LP Each time the date is set, a pair of date change records are written to -\fB/var/adm/wtmpx\fR. The first record is the old date denoted by the string +\fB/var/log/wtmpx\fR. The first record is the old date denoted by the string "\fBold time\fR" placed in the \fBline\fR field and the flag \fB\fR\fBOLD_TIME\fR\fB\fR placed in the \fBtype\fR field of the \fButmpx\fR structure. The second record specifies the new date and is denoted by the @@ -64,7 +64,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/wtmpx\fR\fR +\fB\fB/var/log/wtmpx\fR\fR .ad .RS 18n history of user access and administration information diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/halt.8 --- a/share/man/man8/halt.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/halt.8 Mon May 20 12:59:45 2019 -0400 @@ -28,7 +28,7 @@ .LP The \fBhalt\fR and \fBpoweroff\fR utilities normally log the system shutdown to the system log daemon, \fBsyslogd\fR(8), and place a shutdown record in the -login accounting file \fB/var/adm/wtmpx\fR. These actions are inhibited if the +login accounting file \fB/var/log/wtmpx\fR. These actions are inhibited if the \fB-n\fR or \fB-q\fR options are present. .SH OPTIONS .sp @@ -85,7 +85,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/wtmpx\fR\fR +\fB\fB/var/log/wtmpx\fR\fR .ad .RS 18n History of user access and administration information. diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/in.comsat.8 --- a/share/man/man8/in.comsat.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/in.comsat.8 Mon May 20 12:59:45 2019 -0400 @@ -39,7 +39,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .RS 18n user access and administration information diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/in.fingerd.8 --- a/share/man/man8/in.fingerd.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/in.fingerd.8 Mon May 20 12:59:45 2019 -0400 @@ -30,7 +30,7 @@ .SH FILES .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .RS 20n User and accounting information. @@ -48,7 +48,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/lastlog.v2\fR\fR +\fB\fB/var/log/lastlog.v2\fR\fR .ad .RS 20n Last login times. diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/init.8 --- a/share/man/man8/init.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/init.8 Mon May 20 12:59:45 2019 -0400 @@ -158,9 +158,9 @@ .sp .LP When \fBinit\fR receives a signal telling it that a process it spawned has -died, it records the fact and the reason it died in \fB/var/adm/utmpx\fR and -\fB/var/adm/wtmpx\fR if it exists (see \fBwho\fR(1)). A history of the -processes spawned is kept in \fB/var/adm/wtmpx.\fR +died, it records the fact and the reason it died in \fB/var/log/utmpx\fR and +\fB/var/log/wtmpx\fR if it exists (see \fBwho\fR(1)). A history of the +processes spawned is kept in \fB/var/log/wtmpx.\fR .sp .LP If \fBinit\fR receives a \fBpowerfail\fR signal (\fBSIGPWR\fR) it scans @@ -493,7 +493,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .sp .6 .RS 4n @@ -503,7 +503,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/wtmpx\fR\fR +\fB\fB/var/log/wtmpx\fR\fR .ad .sp .6 .RS 4n diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/logadm.8 --- a/share/man/man8/logadm.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/logadm.8 Mon May 20 12:59:45 2019 -0400 @@ -457,7 +457,7 @@ .RS 4n Specify the template to use when renaming log files. .sp -\fItemplate\fR can be a simple name, such as \fB/var/adm/oldfile\fR, or it can +\fItemplate\fR can be a simple name, such as \fB/var/log/oldfile\fR, or it can contain special keywords which are expanded by \fBlogadm\fR and are in the form \fB$\fR\fIword\fR. Allowed sequences are: .sp @@ -718,9 +718,9 @@ \fBExample 1 \fRRotating a File and Keeping Previous Versions .sp .LP -The following example rotates the \fB/var/adm/exacct/proc\fR file, keeping ten -previous versions in \fB/var/adm/exacct/proc.0\fR through -\fB/var/adm/exacct/proc.9\fR. +The following example rotates the \fB/var/log/exacct/proc\fR file, keeping ten +previous versions in \fB/var/log/exacct/proc.0\fR through +\fB/var/log/exacct/proc.9\fR. .sp .LP @@ -729,7 +729,7 @@ .sp .in +2 .nf - % logadm -c /var/adm/exacct/proc + % logadm -c /var/log/exacct/proc .fi .in -2 .sp @@ -750,16 +750,16 @@ .sp .LP -\fBExample 3 \fRRotating /var/adm/sulog and Expiring Based on Age +\fBExample 3 \fRRotating /var/log/sulog and Expiring Based on Age .sp .LP The following entry in the \fB/etc/logadm.conf\fR file rotates the -\fB/var/adm/sulog\fR file and expires any copies older than 30 days. +\fB/var/log/sulog\fR file and expires any copies older than 30 days. .sp .in +2 .nf -/var/adm/sulog -A 30d +/var/log/sulog -A 30d .fi .in -2 .sp @@ -769,13 +769,13 @@ .sp .LP The following entry in the \fB/etc/logadm.conf\fR file rotates the -\fB/var/adm/sulog\fR file and expires old log files when more than 100 +\fB/var/log/sulog\fR file and expires old log files when more than 100 megabytes are used by the sum of all the rotated log files. .sp .in +2 .nf -/var/adm/sulog -S 100m +/var/log/sulog -S 100m .fi .in -2 .sp diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/mount.8 --- a/share/man/man8/mount.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/mount.8 Mon May 20 12:59:45 2019 -0400 @@ -111,7 +111,7 @@ If mount points are specified, \fBumount\fR will only \fBumount\fR those mount points. If none is specified, then \fBumount\fR will attempt to \fBunmount\fR all file systems in \fB/etc/mnttab\fR, with the exception of certain system -required file systems: \fB/\fR, \fB/usr\fR, \fB/var\fR, \fB/var/adm\fR, +required file systems: \fB/\fR, \fB/usr\fR, \fB/var\fR, \fB/var/log\fR, \fB/var/run\fR, \fB/proc\fR, \fB/dev/fd\fR and \fB/tmp\fR. .RE diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/mountall.8 --- a/share/man/man8/mountall.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/mountall.8 Mon May 20 12:59:45 2019 -0400 @@ -49,7 +49,7 @@ .sp .LP \fBumountall\fR causes all mounted file systems in the current zone except -\fBroot\fR, \fB/usr\fR, \fB/var\fR, \fB/var/adm\fR, \fB/var/run\fR, +\fBroot\fR, \fB/usr\fR, \fB/var\fR, \fB/var/log\fR, \fB/var/run\fR, \fB/proc\fR, and \fB/dev/fd\fR to be unmounted. If the \fIFSType\fR is specified, \fBmountall\fR and \fBumountall\fR limit their actions to the \fIFSType\fR specified. There is no guarantee that \fBumountall\fR unmounts diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/reboot.8 --- a/share/man/man8/reboot.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/reboot.8 Mon May 20 12:59:45 2019 -0400 @@ -42,7 +42,7 @@ .LP The \fBreboot\fR utility normally logs the reboot to the system log daemon, \fBsyslogd\fR(8), and places a shutdown record in the login accounting file -\fB/var/adm/wtmpx\fR. These actions are inhibited if the \fB-n\fR or \fB-q\fR +\fB/var/log/wtmpx\fR. These actions are inhibited if the \fB-n\fR or \fB-q\fR options are present. .sp .LP @@ -114,7 +114,7 @@ .sp .6 .RS 4n Avoid calling \fBsync\fR(2) and do not log the reboot to \fBsyslogd\fR(8) or -to \fB/var/adm/wtmpx\fR. The kernel still attempts to sync filesystems prior to +to \fB/var/log/wtmpx\fR. The kernel still attempts to sync filesystems prior to reboot, except if the \fB-d\fR option is also present. If \fB-d\fR is used with \fB-n\fR, the kernel does not attempt to sync file systems. .RE @@ -346,7 +346,7 @@ .SH FILES .ne 2 .na -\fB\fB/var/adm/wtmpx\fR\fR +\fB\fB/var/log/wtmpx\fR\fR .ad .sp .6 .RS 4n diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/runacct.8 --- a/share/man/man8/runacct.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/runacct.8 Mon May 20 12:59:45 2019 -0400 @@ -109,7 +109,7 @@ .ad .RS 14n Merge the daily total accounting records in \fBdaytacct\fR with the summary -total accounting records in \fB/var/adm/acct/sum/tacct\fR. +total accounting records in \fB/var/log/acct/sum/tacct\fR. .RE .sp @@ -157,7 +157,7 @@ .sp .in +2 .nf -example% nohup runacct 2> /var/adm/acct/nite/fd2log & +example% nohup runacct 2> /var/log/acct/nite/fd2log & .fi .in -2 .sp @@ -171,7 +171,7 @@ .sp .in +2 .nf -example% nohup runacct 0601 2>> /var/adm/acct/nite/fd2log & +example% nohup runacct 0601 2>> /var/log/acct/nite/fd2log & .fi .in -2 .sp @@ -185,7 +185,7 @@ .sp .in +2 .nf -example% nohup runacct 0601 MERGE 2>> /var/adm/acct/nite/fd2log & +example% nohup runacct 0601 MERGE 2>> /var/log/acct/nite/fd2log & .fi .in -2 .sp @@ -194,7 +194,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/wtmpx\fR\fR +\fB\fB/var/log/wtmpx\fR\fR .ad .sp .6 .RS 4n @@ -204,7 +204,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/pacct\fR\fIincr\fR\fR +\fB\fB/var/log/pacct\fR\fIincr\fR\fR .ad .sp .6 .RS 4n @@ -214,7 +214,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/acct/nite/active\fR\fR +\fB\fB/var/log/acct/nite/active\fR\fR .ad .sp .6 .RS 4n @@ -224,7 +224,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/acct/nite/daytacct\fR\fR +\fB\fB/var/log/acct/nite/daytacct\fR\fR .ad .sp .6 .RS 4n @@ -234,7 +234,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/acct/nite/lock\fR\fR +\fB\fB/var/log/acct/nite/lock\fR\fR .ad .sp .6 .RS 4n @@ -244,7 +244,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/acct/nite/lock1\fR\fR +\fB\fB/var/log/acct/nite/lock1\fR\fR .ad .sp .6 .RS 4n @@ -254,7 +254,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/acct/nite/lastdate\fR\fR +\fB\fB/var/log/acct/nite/lastdate\fR\fR .ad .sp .6 .RS 4n @@ -264,7 +264,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/acct/nite/statefile\fR\fR +\fB\fB/var/log/acct/nite/statefile\fR\fR .ad .sp .6 .RS 4n diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/sac.8 --- a/share/man/man8/sac.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/sac.8 Mon May 20 12:59:45 2019 -0400 @@ -204,7 +204,7 @@ .TP .ie t \(bu .el o -\fB/var/adm/utmpx\fR +\fB/var/log/utmpx\fR .RE .RS +4 .TP diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/saf.8 --- a/share/man/man8/saf.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/saf.8 Mon May 20 12:59:45 2019 -0400 @@ -755,7 +755,7 @@ .TP .ie t \(bu .el o -It has an entry in \fB/var/adm/utmpx\fR of type LOGIN_PROCESS +It has an entry in \fB/var/log/utmpx\fR of type LOGIN_PROCESS .RE .RS +4 .TP diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/sar.8 --- a/share/man/man8/sar.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/sar.8 Mon May 20 12:59:45 2019 -0400 @@ -51,7 +51,7 @@ .sp .in +2 .nf -su sys -c "/usr/lib/sa/sadc /var/adm/sa/sa\&'date +%d\&'" +su sys -c "/usr/lib/sa/sadc /var/log/sa/sa\&'date +%d\&'" .fi .in -2 .sp @@ -59,7 +59,7 @@ .sp .LP The shell script \fBsa1\fR, a variant of \fBsadc\fR, is used to collect and -store data in the binary file \fB/var/adm/sa/sa\fR\fIdd,\fR where \fBdd\fR is +store data in the binary file \fB/var/log/sa/sa\fR\fIdd,\fR where \fBdd\fR is the current day. The arguments \fIt\fR and \fIn\fR cause records to be written \fIn\fR times at an interval of \fIt\fR seconds, or once if omitted. The following entries in \fB/var/spool/cron/crontabs/sys\fR will produce records @@ -79,7 +79,7 @@ .sp .LP The shell script \fBsa2\fR, a variant of \fBsar\fR, writes a daily report in -the file \fB/var/adm/sa/sar\fR\fIdd.\fR See the \fBOPTIONS\fR section in +the file \fB/var/log/sa/sar\fR\fIdd.\fR See the \fBOPTIONS\fR section in \fBsar\fR(1) for an explanation of the various options. The following entry in \fB/var/spool/cron/crontabs/sys\fR will report important activities hourly during the working day: @@ -104,7 +104,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/sa/sa\fR\fBdd\fR\fR +\fB\fB/var/log/sa/sa\fR\fBdd\fR\fR .ad .sp .6 .RS 4n @@ -114,7 +114,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/sa/sar\fR\fBdd\fR\fR +\fB\fB/var/log/sa/sar\fR\fBdd\fR\fR .ad .sp .6 .RS 4n diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/strclean.8 --- a/share/man/man8/strclean.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/strclean.8 Mon May 20 12:59:45 2019 -0400 @@ -17,7 +17,7 @@ .LP \fBstrclean\fR is used to clean up the STREAMS error logger directory on a regular basis (for example, by using \fBcron\fR. By default, all files with -names matching \fBerror.*\fR in \fB/var/adm/streams\fR that have not been +names matching \fBerror.*\fR in \fB/var/log/streams\fR that have not been modified in the last three days are removed. .SH OPTIONS .sp @@ -39,7 +39,7 @@ \fB\fB-d\fR \fIlogdir\fR\fR .ad .RS 13n -A directory other than \fB/var/adm/streams\fR can be specified using the +A directory other than \fB/var/log/streams\fR can be specified using the \fB-d\fR option. .RE @@ -53,7 +53,7 @@ .sp .in +2 .nf -example% \fBstrclean \fR\fB-d\fR\fB /var/adm/streams \fR\fB-a\fR\fB 3\fR +example% \fBstrclean \fR\fB-d\fR\fB /var/log/streams \fR\fB-a\fR\fB 3\fR .fi .in -2 .sp @@ -61,7 +61,7 @@ .SH FILES .sp .LP -\fB/var/adm/streams/error.\fR* +\fB/var/log/streams/error.\fR* .SH SEE ALSO .sp .LP diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/strerr.8 --- a/share/man/man8/strerr.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/strerr.8 Mon May 20 12:59:45 2019 -0400 @@ -17,7 +17,7 @@ .LP \fBstrerr\fR receives error log messages from the STREAMS-based log driver (see \fBlog\fR(7D)) and appends them to a log file. The resultant error log files -reside in the directory \fB/var/adm/streams\fR, and are named +reside in the directory \fB/var/log/streams\fR, and are named \fBerror.\fR\fImm\fR\fB-\fR\fBdd\fR, where \fImm\fR is the month and \fBdd\fR is the day of the messages contained in each log file. .sp @@ -109,7 +109,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/streams/error.\fR\fImm\fR\fB-\fR\fBdd\fR\fR +\fB\fB/var/log/streams/error.\fR\fImm\fR\fB-\fR\fBdd\fR\fR .ad .sp .6 .RS 4n diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/syslogd.8 --- a/share/man/man8/syslogd.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/syslogd.8 Mon May 20 12:59:45 2019 -0400 @@ -189,7 +189,7 @@ .LP The following example shows the output from \fBsyslogd\fR when message \fBID\fR generation \fBis\fR enabled. The message \fBID\fR is displayed when writing to -log file\fB/var/adm/messages\fR. +log file\fB/var/log/messages\fR. .sp .in +2 diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/utmpd.8 --- a/share/man/man8/utmpd.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/utmpd.8 Mon May 20 12:59:45 2019 -0400 @@ -16,7 +16,7 @@ .SH DESCRIPTION .LP -The \fButmpd\fR daemon monitors the \fB/var/adm/utmpx\fR file. See +The \fButmpd\fR daemon monitors the \fB/var/log/utmpx\fR file. See \fButmpx\fR(4) (and \fButmp\fR(4) for historical information). .sp .LP @@ -24,9 +24,9 @@ It maintains a table of processes and uses \fBpoll\fR(2) on \fB/proc\fR files to detect process termination. When \fButmpd\fR detects that a process has terminated, it checks that the process has removed its \fButmpx\fR entry from -\fB/var/adm/utmpx\fR. If the process' \fButmpx\fR entry has not been removed, +\fB/var/log/utmpx\fR. If the process' \fButmpx\fR entry has not been removed, \fButmpd\fR removes the entry. By periodically scanning the -\fB/var/adm/utmpx\fR file, \fButmpd\fR also monitors processes that are not in +\fB/var/log/utmpx\fR file, \fButmpd\fR also monitors processes that are not in its table. .SH OPTIONS .ne 2 @@ -115,7 +115,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .sp .6 .RS 4n @@ -141,11 +141,11 @@ \fBattributes\fR(5), \fBsmf\fR(5) .SH NOTES .LP -If the filesystem holding \fB/var/adm/wtmpx\fR is mounted with options which +If the filesystem holding \fB/var/log/wtmpx\fR is mounted with options which inhibit or defer access time updates, an unknown amount of error will be introduced into the \fButmp\fR \fBDOWN_TIME\fR record's timestamp in the event of an uncontrolled shutdown (for example, a crash or loss of power ). -Controlled shutdowns will update the modify time of \fB/var/adm/wtmpx\fR, which +Controlled shutdowns will update the modify time of \fB/var/log/wtmpx\fR, which will be used on the next boot to determine when the previous shutdown occurred, regardless of access time deferral or inhibition. .sp diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/volcopy_ufs.8 --- a/share/man/man8/volcopy_ufs.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/volcopy_ufs.8 Mon May 20 12:59:45 2019 -0400 @@ -105,7 +105,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/filesave.log\fR\fR +\fB\fB/var/log/filesave.log\fR\fR .ad .RS 25n a record of file systems/volumes copied diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/whodo.8 --- a/share/man/man8/whodo.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/whodo.8 Mon May 20 12:59:45 2019 -0400 @@ -18,7 +18,7 @@ .sp .LP The \fBwhodo\fR command produces formatted and dated output from information in -the \fB/var/adm/utmpx\fR and \fB/proc/pid\fR files. +the \fB/var/log/utmpx\fR and \fB/proc/pid\fR files. .sp .LP The display is headed by the date, time, and machine name. For each user logged @@ -187,7 +187,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/utmpx\fR\fR +\fB\fB/var/log/utmpx\fR\fR .ad .RS 18n User access and administration information diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man8/wracct.8 --- a/share/man/man8/wracct.8 Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man8/wracct.8 Mon May 20 12:59:45 2019 -0400 @@ -157,7 +157,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/exacct/task\fR\fR +\fB\fB/var/log/exacct/task\fR\fR .ad .RS 24n @@ -166,7 +166,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/exacct/proc\fR\fR +\fB\fB/var/log/exacct/proc\fR\fR .ad .RS 24n Extended accounting data files. diff -r 5759ef3a98b8 -r 893b1f7b6690 share/man/man9f/strlog.9f --- a/share/man/man9f/strlog.9f Mon May 20 15:21:44 2019 -0400 +++ b/share/man/man9f/strlog.9f Mon May 20 12:59:45 2019 -0400 @@ -153,7 +153,7 @@ sent. \fBstrace\fR(8) receives messages from the \fBlog\fR driver and sends them to the standard output. \fBstrerr\fR(8) receives error messages from the \fBlog\fR driver and appends them to a file called -\fB/var/adm/streams/error.\fR\fImm-dd\fR, where \fImm-dd\fR identifies the date +\fB/var/log/streams/error.\fR\fImm-dd\fR, where \fImm-dd\fR identifies the date of the error message. .SH RETURN VALUES .sp @@ -169,7 +169,7 @@ .sp .ne 2 .na -\fB\fB/var/adm/streams/error.\fR\fImm-dd\fR\fR +\fB\fB/var/log/streams/error.\fR\fImm-dd\fR\fR .ad .sp .6 .RS 4n diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/Targetdirs --- a/usr/src/Targetdirs Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/Targetdirs Mon May 20 12:59:45 2019 -0400 @@ -280,11 +280,6 @@ /usr/share/man \ /usr/share/misc \ /var \ - /var/adm \ - /var/adm/exacct \ - /var/adm/pool \ - /var/adm/sa \ - /var/adm/streams \ /var/cores \ /var/cron \ /var/db \ @@ -296,7 +291,10 @@ /var/krb5/rcache/root \ /var/ld \ /var/log \ + /var/log/exacct \ /var/log/pool \ + /var/log/sa \ + /var/log/streams \ /var/logadm \ /var/mail \ /var/news \ @@ -430,8 +428,7 @@ # The default value for DIRMODE is specified in usr/src/Makefile.master. # -$(ROOT)/var/adm \ -$(ROOT)/var/adm/sa := DIRMODE= 775 +$(ROOT)/var/log/sa := DIRMODE= 775 $(ROOT)/var/spool/lp:= DIRMODE= 775 diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/Adm/sun/passwd --- a/usr/src/cmd/Adm/sun/passwd Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/Adm/sun/passwd Mon May 20 12:59:45 2019 -0400 @@ -2,7 +2,7 @@ daemon:x:1:1::/: bin:x:2:2::/usr/bin: sys:x:3:3::/: -adm:x:4:4:Admin:/var/adm: +adm:x:4:4:Admin:/var/log: lp:x:71:8:Line Printer Admin:/usr/spool/lp: uucp:x:5:5:uucp Admin:/usr/lib/uucp: nuucp:x:9:9:uucp Admin:/var/spool/uucppublic:/usr/lib/uucp/uucico diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/Makefile --- a/usr/src/cmd/acct/Makefile Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/Makefile Mon May 20 12:59:45 2019 -0400 @@ -65,7 +65,7 @@ LIBACCTD= $(ROOTLIB)/acct ETCACCTD= $(ROOTETC)/acct ETCINITD= $(ROOTETC)/init.d -VARADMD= $(ROOT)/var/adm +VARADMD= $(ROOT)/var/log ACCTDIR= $(VARADMD)/acct ACCTSUBDIRS= $(ACCTDIR)/nite $(ACCTDIR)/fiscal $(ACCTDIR)/sum WKDIRS= $(ACCTDIR) $(ACCTSUBDIRS) diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/acctcms.c --- a/usr/src/cmd/acct/acctcms.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/acctcms.c Mon May 20 12:59:45 2019 -0400 @@ -44,7 +44,7 @@ * -t process records in total (old) style (tcms.h) format * file file in [pt]cms.h (if -s seen already) or acct.h (if not) * expected use: - * acctcms /var/adm/pacct? > today; acctcms -s old today >new + * acctcms /var/log/pacct? > today; acctcms -s old today >new * cp new old; rm new * acctcms -a today; acctcms -a old */ diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/acctcon.c --- a/usr/src/cmd/acct/acctcon.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/acctcon.c Mon May 20 12:59:45 2019 -0400 @@ -31,7 +31,7 @@ * acctcon [-l file] [-o file] #include diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/chargefee.sh --- a/usr/src/cmd/acct/chargefee.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/chargefee.sh Mon May 20 12:59:45 2019 -0400 @@ -27,7 +27,7 @@ #ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6 */ # "chargefee login-name number" # "emits tacct.h/ascii record to charge name $number" -cd /var/adm +cd /var/log PATH=/usr/lib/acct:/usr/bin:/usr/sbin if test $# -lt 2; then echo "usage: chargefee name number" >&2 diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/ckpacct.sh --- a/usr/src/cmd/acct/ckpacct.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/ckpacct.sh Mon May 20 12:59:45 2019 -0400 @@ -29,13 +29,13 @@ # #ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.9 */ -# periodically check the size of /var/adm/pacct +# periodically check the size of /var/log/pacct # if over $1 blocks (default: maxi 200, mini 500), execute # turnacct switch -_adm=/var/adm +_adm=/var/log PATH=/usr/lib/acct:/usr/bin:/usr/sbin -trap "rm -f /var/adm/cklock*; exit 0" 0 1 2 3 9 15 +trap "rm -f /var/log/cklock*; exit 0" 0 1 2 3 9 15 export PATH if [ -f uts -a uts ] @@ -45,7 +45,7 @@ _max=${1-500} fi _MIN_BLKS=500 -cd /var/adm +cd /var/log # set up lock files to prevent simultaneous checking @@ -54,7 +54,7 @@ ln cklock cklock1 if test $? -ne 0 ; then exit 1; fi -# If there are less than $_MIN_BLKS free blocks left on the /var/adm +# If there are less than $_MIN_BLKS free blocks left on the /var/log # file system, turn off the accounting (unless things improve # the accounting wouldn't run anyway). If something has # returned the file system space, restart accounting. This diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/dodisk.sh --- a/usr/src/cmd/acct/dodisk.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/dodisk.sh Mon May 20 12:59:45 2019 -0400 @@ -39,7 +39,7 @@ else format="special dev mnt fstype fsckpass automnt mntflags" fi -_dir=/var/adm +_dir=/var/log _pickup=acct/nite set -- `getopt o $*` if [ $? -ne 0 ] diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/lastlogin.sh --- a/usr/src/cmd/acct/lastlogin.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/lastlogin.sh Mon May 20 12:59:45 2019 -0400 @@ -30,7 +30,7 @@ # " because lastlogin is run at 4am and checks the last" # " 24 hrs worth of process accounting info (in pacct)" PATH=/usr/lib/acct:/usr/bin:/usr/sbin -cd /var/adm/acct +cd /var/log/acct if test ! -r sum/loginlog; then nulladm sum/loginlog fi diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/monacct.sh --- a/usr/src/cmd/acct/monacct.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/monacct.sh Mon May 20 12:59:45 2019 -0400 @@ -26,7 +26,7 @@ #ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6 */ # "this procedure should be run periodically ( by month or fiscal )" -_adm=/var/adm +_adm=/var/log _sum=${_adm}/acct/sum _fiscal=${_adm}/acct/fiscal PATH=:/usr/lib/acct:/usr/bin:/usr/sbin diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/prdaily.sh --- a/usr/src/cmd/acct/prdaily.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/prdaily.sh Mon May 20 12:59:45 2019 -0400 @@ -46,9 +46,9 @@ shift `expr $OPTIND - 1` date=`date +%m%d` _sysname="`uname -n`" -_nite=/var/adm/acct/nite +_nite=/var/log/acct/nite _lib=/usr/lib/acct -_sum=/var/adm/acct/sum +_sum=/var/log/acct/sum cd ${_nite} if [ `expr "$1" : [01][0-9][0-3][0-9]` -eq 4 -a "$1" != "$date" ]; then diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/remove.sh --- a/usr/src/cmd/acct/remove.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/remove.sh Mon May 20 12:59:45 2019 -0400 @@ -25,6 +25,6 @@ #ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6 */ -rm -f /var/adm/acct/sum/wtmp* -rm -f /var/adm/acct/sum/pacct* -rm -f /var/adm/acct/nite/lock* +rm -f /var/log/acct/sum/wtmp* +rm -f /var/log/acct/sum/pacct* +rm -f /var/log/acct/nite/lock* diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/runacct.sh --- a/usr/src/cmd/acct/runacct.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/runacct.sh Mon May 20 12:59:45 2019 -0400 @@ -30,10 +30,10 @@ # "does process, connect, disk, and fee accounting" # "prepares command summaries" # "shell is restartable and provides reasonable diagnostics" -_adm=/var/adm -_nite=/var/adm/acct/nite -_sum=/var/adm/acct/sum -_wtmpx=/var/adm/wtmpx +_adm=/var/log +_nite=/var/log/acct/nite +_sum=/var/log/acct/sum +_wtmpx=/var/log/wtmpx PATH=/usr/lib/acct:/usr/bin:/usr/sbin export PATH _statefile=${_nite}/statefile @@ -57,7 +57,7 @@ exit 1 fi -# Check to see if there is enough space in /var/adm to do nitely accounting +# Check to see if there is enough space in /var/log to do nitely accounting # _blocks=`df $_adm | sed 's/.*://' | awk '{ print $1 }'` if [ "$_blocks" -le $_MIN_BLKS ];then @@ -411,7 +411,7 @@ # " should be done manually, or just cleanup first" -# " FILE USAGE: all files in /var/adm/acct/nite unless specified" +# " FILE USAGE: all files in /var/log/acct/nite unless specified" # " statefile records progess of runacct" # " lastdate last day runacct ran in date +%m%d format" @@ -431,7 +431,7 @@ # " daycms ascii daily command summary used by prdaily" # " cms acsii total command summary used by prdaily" -# " following files in /var/adm directory" +# " following files in /var/log directory" # " fee output from chargefee program" # " pacct active pacct file" @@ -439,7 +439,7 @@ # " Spacctn.MMDD pacct files for MMDD after SETUP state" # " wtmpx active wtmpx file" -# " following files in /var/adm/acct/sum" +# " following files in /var/log/acct/sum" # " loginlog output of lastlogin used in prdaily" # " tacct total tacct file for current fiscal" diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/shutacct.sh --- a/usr/src/cmd/acct/shutacct.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/shutacct.sh Mon May 20 12:59:45 2019 -0400 @@ -32,5 +32,5 @@ # "arg added to /var/wtmpx to record reason, defaults to shutdown" PATH=/usr/lib/acct:/usr/bin:/usr/sbin _reason=${1-"acctg off"} -acctwtmp "${_reason}" /var/adm/wtmpx +acctwtmp "${_reason}" /var/log/wtmpx turnacct off diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/startup.sh --- a/usr/src/cmd/acct/startup.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/startup.sh Mon May 20 12:59:45 2019 -0400 @@ -30,9 +30,9 @@ # "startup (acct) - should be called from /etc/rc" # "whenever system is brought up" PATH=/usr/lib/acct:/usr/bin:/usr/sbin -acctwtmp "acctg on" /var/adm/wtmpx +acctwtmp "acctg on" /var/log/wtmpx turnacct switch # "clean up yesterdays accounting files" -rm -f /var/adm/acct/sum/wtmp* -rm -f /var/adm/acct/sum/pacct* -rm -f /var/adm/acct/nite/lock* +rm -f /var/log/acct/sum/wtmp* +rm -f /var/log/acct/sum/pacct* +rm -f /var/log/acct/nite/lock* diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acct/turnacct.sh --- a/usr/src/cmd/acct/turnacct.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acct/turnacct.sh Mon May 20 12:59:45 2019 -0400 @@ -32,9 +32,9 @@ # "turnacct on makes sure it's on" # "turnacct off turns it off" # "turnacct switch switches pacct to pacct?, starts fresh one" -# "/var/adm/pacct is always the current pacct file" +# "/var/log/pacct is always the current pacct file" PATH=/usr/lib/acct:/usr/bin:/usr/sbin -cd /var/adm +cd /var/log case "$1" in on) if test ! -r pacct @@ -49,7 +49,7 @@ _rc=$? ;; switch) - pfexec /usr/sbin/logadm -p now /var/adm/pacct + pfexec /usr/sbin/logadm -p now /var/log/pacct if test ! -r pacct then nulladm pacct diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/acctadm/utils.c --- a/usr/src/cmd/acctadm/utils.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/acctadm/utils.c Mon May 20 12:59:45 2019 -0400 @@ -124,7 +124,7 @@ * pathname and the existing contents of the file (if any) must be of the * requested type. Needs euid 0 to open the root-owned accounting file. * file_dac_write is required to create a new file in a directory not owned - * by root (/var/adm/exacct is owned by 'adm'). Assumes sys_acct privilege is + * by root (/var/log/exacct is owned by 'adm'). Assumes sys_acct privilege is * already asserted by caller. */ int diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/cmd-inet/usr.bin/pppd/sys-solaris.c --- a/usr/src/cmd/cmd-inet/usr.bin/pppd/sys-solaris.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/sys-solaris.c Mon May 20 12:59:45 2019 -0400 @@ -2856,7 +2856,7 @@ /* * logwtmp() * - * Write an accounting record to the /var/adm/wtmp file. + * Write an accounting record to the /var/log/wtmp file. */ /*ARGSUSED*/ void @@ -2881,7 +2881,7 @@ utmpx.ut_type = DEAD_PROCESS; } (void) gettimeofday(&utmpx.ut_tv, NULL); - updwtmpx("/var/adm/wtmpx", &utmpx); + updwtmpx("/var/log/wtmpx", &utmpx); } /* diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/cmd-inet/usr.sbin/in.comsat.c --- a/usr/src/cmd/cmd-inet/usr.sbin/in.comsat.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/cmd-inet/usr.sbin/in.comsat.c Mon May 20 12:59:45 2019 -0400 @@ -61,7 +61,7 @@ #ifndef UTMPX_FILE -#define UTMPX_FILE "/var/adm/utmpx" +#define UTMPX_FILE "/var/log/utmpx" #endif /* UTMPX_FILE */ int debug = 0; diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/date/date.xcl --- a/usr/src/cmd/date/date.xcl Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/date/date.xcl Mon May 20 12:59:45 2019 -0400 @@ -24,4 +24,4 @@ msgid "%a %b %e %H:%M:%S GMT %Y" msgid "-a" msgid "-u" -msgid "/var/adm/wtmp" +msgid "/var/log/wtmp" diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/dmesg/dmesg.sh --- a/usr/src/cmd/dmesg/dmesg.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/dmesg/dmesg.sh Mon May 20 12:59:45 2019 -0400 @@ -28,5 +28,5 @@ /usr/bin/echo /usr/bin/date -/usr/bin/cat -sv `/usr/bin/ls -tr1 /var/adm/messages.? 2>/dev/null` \ - /var/adm/messages | /usr/bin/tail -200 +/usr/bin/cat -sv `/usr/bin/ls -tr1 /var/log/messages.? 2>/dev/null` \ + /var/log/messages | /usr/bin/tail -200 diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c --- a/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/fm/modules/common/syslog-msgs/syslog.c Mon May 20 12:59:45 2019 -0400 @@ -100,7 +100,7 @@ * We send this message to log(7D) using putmsg() with SL_CONSOLE | SL_LOGONLY * set in the log_ctl_t. The log driver allows us to set SL_LOGONLY when we * construct messages ourself, indicating that syslogd should only emit the - * message to /var/adm/messages and any remote hosts, and skip the console. + * message to /var/log/messages and any remote hosts, and skip the console. * Then we emit the message a second time, without the special prefix, to the * sysmsg(7D) device, which handles console redirection and also permits us * to output any characters we like to the console, including \n and \r. diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/fs.d/ufs/volcopy/volcopy.c --- a/usr/src/cmd/fs.d/ufs/volcopy/volcopy.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/fs.d/ufs/volcopy/volcopy.c Mon May 20 12:59:45 2019 -0400 @@ -1475,9 +1475,9 @@ { FILE *fp = NULL; - fp = fopen("/var/adm/filesave.log", "a"); + fp = fopen("/var/log/filesave.log", "a"); if (fp == NULL) { - perr(1, "volcopy: cannot open /var/adm/filesave.log\n"); + perr(1, "volcopy: cannot open /var/log/filesave.log\n"); } fprintf(fp, "%s%c%.6s%c%.6s -> %s%c%.6s%c%.6s on %.24s\n", diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/fs.d/umount.c --- a/usr/src/cmd/fs.d/umount.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/fs.d/umount.c Mon May 20 12:59:45 2019 -0400 @@ -119,7 +119,7 @@ "/tmp", "/usr", "/var", - "/var/adm", + "/var/log", "/var/run", SHARETAB, NULL diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/halt/halt.c --- a/usr/src/cmd/halt/halt.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/halt/halt.c Mon May 20 12:59:45 2019 -0400 @@ -1027,7 +1027,7 @@ (uintptr_t)bootargs_saved) != 0) { (void) fprintf(stderr, gettext("%s: Not all drivers " "have implemented quiesce(9E)\n" - "\tPlease see /var/adm/messages for drivers that haven't\n" + "\tPlease see /var/log/messages for drivers that haven't\n" "\timplemented quiesce(9E).\n"), cmdname); } else if (*is_dryrun) { (void) fprintf(stderr, gettext("%s: All drivers have " diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/initpkg/init.d/README.rcS --- a/usr/src/cmd/initpkg/init.d/README.rcS Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/initpkg/init.d/README.rcS Mon May 20 12:59:45 2019 -0400 @@ -63,7 +63,7 @@ /dev/fd /tmp /var - /var/adm + /var/log /var/run /dev /devices diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/initpkg/nscd.conf --- a/usr/src/cmd/initpkg/nscd.conf Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/initpkg/nscd.conf Mon May 20 12:59:45 2019 -0400 @@ -32,7 +32,7 @@ # networks, passwd, printers, prof_attr, project # protocols, rpc, services, user_attr # -# logfile /var/adm/nscd.log +# logfile /var/log/nscd.log # enable-cache hosts no debug-level 0 diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/initpkg/rcS.sh --- a/usr/src/cmd/initpkg/rcS.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/initpkg/rcS.sh Mon May 20 12:59:45 2019 -0400 @@ -37,7 +37,7 @@ # mount /usr (if a separate file system) # set the system name # check the root (/) and /usr file systems -# check and mount /var and /var/adm (if a separate file system) +# check and mount /var and /var/log (if a separate file system) # mount pseudo file systems (/dev/fd) # if this is a reconfiguration boot, [re]build the device entries # check and mount other file systems to be mounted in single user mode diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/initpkg/umountall.sh --- a/usr/src/cmd/initpkg/umountall.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/initpkg/umountall.sh Mon May 20 12:59:45 2019 -0400 @@ -267,7 +267,7 @@ /tmp | \ /usr | \ /var | \ - /var/adm | \ + /var/log | \ /var/run | \ '' ) # diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/last/Makefile --- a/usr/src/cmd/last/Makefile Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/last/Makefile Mon May 20 12:59:45 2019 -0400 @@ -25,9 +25,8 @@ PROG= last UTMPS= wtmpx -ROOTADM= $(ROOT)/var/adm +ROOTADM= $(ROOT)/var/log ROOTUTMPS= $(UTMPS:%=$(ROOTADM)/%) -ETCTOVARADM= ../var/adm include ../Makefile.cmd diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/last/last.c --- a/usr/src/cmd/last/last.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/last/last.c Mon May 20 12:59:45 2019 -0400 @@ -133,7 +133,7 @@ char *crmsg = NULL; long outrec = 0; long maxrec = 0x7fffffffL; - char *wtmpfile = "/var/adm/wtmpx"; + char *wtmpfile = "/var/log/wtmpx"; size_t hostf_len; (void) setlocale(LC_ALL, ""); @@ -528,7 +528,7 @@ } /* * Both dtremote and dtlocal can have multiple entries in - * /var/adm/wtmpx with these values, so the user and host + * /var/log/wtmpx with these values, so the user and host * entries are also checked */ if ((bp->ut_type == BOOT_TIME) || (bp->ut_type == DOWN_TIME)) diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/lastcomm/lastcomm.c --- a/usr/src/cmd/lastcomm/lastcomm.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/lastcomm/lastcomm.c Mon May 20 12:59:45 2019 -0400 @@ -84,7 +84,7 @@ * accounting. */ if (acctctl(AC_PROC | AC_FILE_GET, buf, PATH_MAX) < 0) - return (lc_pacct("/var/adm/pacct", argc, argv, optind)); + return (lc_pacct("/var/log/pacct", argc, argv, optind)); else return (lc_exacct(buf, argc, argv, optind)); } else { diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/lastcomm/lc_pacct.c --- a/usr/src/cmd/lastcomm/lc_pacct.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/lastcomm/lc_pacct.c Mon May 20 12:59:45 2019 -0400 @@ -17,7 +17,7 @@ /* * lc_pacct() provides the functionality of lastcomm when applied to the basic - * SVR4 accounting file, /var/adm/pacct. Definitions for this accounting file + * SVR4 accounting file, /var/log/pacct. Definitions for this accounting file * format are given in . */ diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/logadm/logadm.conf --- a/usr/src/cmd/logadm/logadm.conf Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/logadm/logadm.conf Mon May 20 12:59:45 2019 -0400 @@ -36,7 +36,7 @@ # root's crontab (see crontab(1)). # /var/log/syslog -C 8 -a 'kill -HUP `cat /var/run/syslog.pid`' -/var/adm/messages -C 4 -a 'kill -HUP `cat /var/run/syslog.pid`' +/var/log/messages -C 4 -a 'kill -HUP `cat /var/run/syslog.pid`' /var/cron/log -c -s 512k -t /var/cron/olog /var/lp/logs/lpsched -C 2 -N -t '$file.$N' /var/fm/fmd/errlog -N -s 2m -M '/usr/sbin/fmadm -q rotate errlog && mv /var/fm/fmd/errlog.0- $nfile' @@ -45,7 +45,7 @@ # # The entry below is used by turnacct(8) # -/var/adm/pacct -C 0 -N -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never +/var/log/pacct -C 0 -N -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never # # The entry below manages the Dynamic Resource Pools daemon (poold(8)) logfile. # diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/logadm/tester --- a/usr/src/cmd/logadm/tester Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/logadm/tester Mon May 20 12:59:45 2019 -0400 @@ -285,13 +285,13 @@ # logadm typically runs early every morning via an entry in # root's crontab (see crontab(1)). # -/var/adm/messages -C 4 -P 'Thu Nov 1 16:56:42 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`' +/var/log/messages -C 4 -P 'Thu Nov 1 16:56:42 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`' /var/cron/log -s 512k -t /var/cron/olog /var/lp/logs/lpsched -C 2 -N -t '$file.$N' # # The entry below is used by turnacct(8) # -/var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never +/var/log/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never apache -C 24 -a '/usr/apache/bin/apachectl graceful' -p 1m -t '/var/apache/old-logs/$basename.%Y-%m' '/var/apache/logs/*{access,error}_log' /var/log/syslog -C 8 -P 'Thu Nov 1 09:16:38 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`' /var/apache/logs/access_log -P 'Thu Nov 1 08:27:56 2001' @@ -822,10 +822,10 @@ set_testconffile; set_file('std.out.expect', <<'EOF'); -/var/adm/messages -C 4 -P 'Thu Nov 1 16:56:42 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`' +/var/log/messages -C 4 -P 'Thu Nov 1 16:56:42 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`' /var/cron/log -s 512k -t /var/cron/olog /var/lp/logs/lpsched -C 2 -N -t '$file.$N' -/var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never +/var/log/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never apache -C 24 -a '/usr/apache/bin/apachectl graceful' -p 1m -t '/var/apache/old-logs/$basename.%Y-%m' '/var/apache/logs/*{access,error}_log' /var/log/syslog -C 8 -P 'Thu Nov 1 09:16:38 2001' -a 'kill -HUP `cat /var/run/*syslog*pid`' /var/apache/logs/access_log -P 'Thu Nov 1 08:27:56 2001' @@ -857,7 +857,7 @@ set_file('std.out.expect', <<'EOF'); /var/cron/log -s 512k -t /var/cron/olog -/var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never +/var/log/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never EOF set_file('checktest', <<'EOF'); @@ -868,7 +868,7 @@ set_file('runtest', <<"EOF"); # test "logadmV2" $envsetup -exec $bindir/logadm -f testfile.conf -F testfile.conf -V /var/cron/log /var/adm/pacct >std.out 2>std.err +exec $bindir/logadm -f testfile.conf -F testfile.conf -V /var/cron/log /var/log/pacct >std.out 2>std.err EOF } @@ -885,7 +885,7 @@ 18d17 < /var/cron/log -s 512k -t /var/cron/olog 23d21 -< /var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never +< /var/log/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never EOF set_file('checktest', <<'EOF'); @@ -897,7 +897,7 @@ set_file('runtest', <<"EOF"); # test "logadmr" $envsetup -exec $bindir/logadm -f testfile.conf -F testfile.conf -r /var/cron/log /var/adm/pacct >std.out 2>std.err +exec $bindir/logadm -f testfile.conf -F testfile.conf -r /var/cron/log /var/log/pacct >std.out 2>std.err EOF } @@ -1188,7 +1188,7 @@ # # The entry below is used by turnacct(8) # -/var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never +/var/log/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never EOF system("/bin/cp logadm.conf logadm.conf.orig"); @@ -1757,7 +1757,7 @@ # # The entry below is used by turnacct(8) # -/var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never +/var/log/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never EOF $gid = $); @@ -1808,7 +1808,7 @@ chown $>:$gid dir2/messages EOF chmod 664 dir2/messages -# processing logname: /var/adm/pacct +# processing logname: /var/log/pacct # using default template: $file.$n sh -c echo kill -HUP `cat /var/run/*syslog*pid` >> cmd.out # -a cmd # logadm.conf and logadm.timestamps unchanged diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/login/login.c --- a/usr/src/cmd/login/login.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/login/login.c Mon May 20 12:59:45 2019 -0400 @@ -126,7 +126,7 @@ /* * Login logging support */ -#define LOGINLOG "/var/adm/loginlog" /* login log file */ +#define LOGINLOG "/var/log/loginlog" /* login log file */ #define LNAME_SIZE 20 /* size of logged logname */ #define TTYN_SIZE 15 /* size of logged tty name */ #define TIME_SIZE 30 /* size of logged time string */ diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/sa/README --- a/usr/src/cmd/sa/README Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/sa/README Mon May 20 12:59:45 2019 -0400 @@ -31,7 +31,7 @@ 1. The line - /usr/lib/sa/sadc /var/adm/sa/sa`date +%d` + /usr/lib/sa/sadc /var/log/sa/sa`date +%d` is executed by the start method for the system/sar:default service, if enabled diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/sa/sa1.sh --- a/usr/src/cmd/sa/sa1.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/sa/sa1.sh Mon May 20 12:59:45 2019 -0400 @@ -28,7 +28,7 @@ # sa1.sh 1.5 of 5/8/89 DATE=`/usr/bin/date +%d` ENDIR=/usr/lib/sa -DFILE=/var/adm/sa/sa$DATE +DFILE=/var/log/sa/sa$DATE cd $ENDIR if [ $# = 0 ] then diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/sa/sa2.sh --- a/usr/src/cmd/sa/sa2.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/sa/sa2.sh Mon May 20 12:59:45 2019 -0400 @@ -27,9 +27,9 @@ #ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.4 */ # sa2.sh 1.4 of 5/8/89 DATE=`/usr/bin/date +%d` -RPT=/var/adm/sa/sar$DATE -DFILE=/var/adm/sa/sa$DATE +RPT=/var/log/sa/sar$DATE +DFILE=/var/log/sa/sa$DATE ENDIR=/usr/bin cd $ENDIR $ENDIR/sar $* -f $DFILE > $RPT -/usr/bin/find /var/adm/sa \( -name 'sar*' -o -name 'sa*' \) -mtime +7 -exec /usr/bin/rm {} \; +/usr/bin/find /var/log/sa \( -name 'sar*' -o -name 'sa*' \) -mtime +7 -exec /usr/bin/rm {} \; diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/sa/sar.c --- a/usr/src/cmd/sa/sar.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/sa/sar.c Mon May 20 12:59:45 2019 -0400 @@ -204,7 +204,7 @@ if (fflg == 0) { temp = time(NULL); curt = localtime(&temp); - (void) snprintf(flnm, PATH_MAX, "/var/adm/sa/sa%.2d", + (void) snprintf(flnm, PATH_MAX, "/var/log/sa/sa%.2d", curt->tm_mday); } if ((fin = open(flnm, O_RDONLY)) == -1) diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/sa/svc-sar --- a/usr/src/cmd/sa/svc-sar Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/sa/svc-sar Mon May 20 12:59:45 2019 -0400 @@ -46,7 +46,7 @@ 'start') if [ $_INIT_RUN_NPREV -eq 0 ]; then - /usr/lib/sa/sadc /var/adm/sa/sa`date +%d` + /usr/lib/sa/sadc /var/log/sa/sa`date +%d` if [ ! -f /var/spool/cron/crontabs/sys ]; then cat << EOF > /var/spool/cron/crontabs/sys diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/smserverd/smediad.c --- a/usr/src/cmd/smserverd/smediad.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/smserverd/smediad.c Mon May 20 12:59:45 2019 -0400 @@ -99,7 +99,7 @@ * --------------------- * This is a predefined descriptor used by client to establish a * connection with the server. This descriptor is available to the client - * as /var/adm/smedia_svc + * as /var/log/smedia_svc * The client uses the main_door_descriptor to obtain a dedicated * client_door_descriptor for itself. The smedia_get_handle call communicates * to the server using the main_door_descriptor and obtains the diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/spell/Makefile --- a/usr/src/cmd/spell/Makefile Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/spell/Makefile Mon May 20 12:59:45 2019 -0400 @@ -57,7 +57,7 @@ CLOBBERFILES += htemp1 htemp2 ROOTSPELLD = $(ROOTLIB)/spell -ROOTVARADMD = $(ROOT)/var/adm +ROOTVARADMD = $(ROOT)/var/log ROOTDIRS= $(ROOTSPELLD) BINF= spell diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/spell/compress.sh --- a/usr/src/cmd/spell/compress.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/spell/compress.sh Mon May 20 12:59:45 2019 -0400 @@ -29,6 +29,6 @@ trap 'rm -f /usr/tmp/spellhist;exit' 1 2 3 15 echo "COMPRESSED `date`" > /usr/tmp/spellhist -grep -v ' ' /var/adm/spellhist | sort -fud >> /usr/tmp/spellhist -cp /usr/tmp/spellhist /var/adm +grep -v ' ' /var/log/spellhist | sort -fud >> /usr/tmp/spellhist +cp /usr/tmp/spellhist /var/log rm -f /usr/tmp/spellhist diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/spell/spell.sh --- a/usr/src/cmd/spell/spell.sh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/spell/spell.sh Mon May 20 12:59:45 2019 -0400 @@ -33,7 +33,7 @@ SPELLPROG=/usr/lib/spell/spellprog -H_SPELL=${H_SPELL:-/var/adm/spellhist} +H_SPELL=${H_SPELL:-/var/log/spellhist} V_SPELL=/dev/null F_SPELL= FT_SPELL= diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/stmfsvc/stmfsvc.c --- a/usr/src/cmd/stmfsvc/stmfsvc.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/stmfsvc/stmfsvc.c Mon May 20 12:59:45 2019 -0400 @@ -167,7 +167,7 @@ default: (void) fprintf(stderr, "%s: %s\n", cmdName, gettext("Unable to load the configuration. " - "See /var/adm/messages for details")); + "See /var/log/messages for details")); (void) fprintf(stderr, "%s: %s\n", cmdName, gettext("For information on reverting the " "stmf:default instance to a previously " diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/streams/log/strclean.c --- a/usr/src/cmd/streams/log/strclean.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/streams/log/strclean.c Mon May 20 12:59:45 2019 -0400 @@ -40,7 +40,7 @@ #define MSGSIZE 128 #define NSECDAY (60*60*24) #define LOGDELAY 2 -#define LOGDEFAULT "/var/adm/streams" +#define LOGDEFAULT "/var/log/streams" #define AGEDEFAULT 3 #define DIRECTORY 040000 #define ACCESS 07 diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/streams/log/strerr.c --- a/usr/src/cmd/streams/log/strerr.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/streams/log/strerr.c Mon May 20 12:59:45 2019 -0400 @@ -47,9 +47,9 @@ #define DATSIZE 8192 #define ADMSTR "root" #define LOGDEV "/dev/log" -#define ERRFILE "/var/adm/streams/error.xxxxx" +#define ERRFILE "/var/log/streams/error.xxxxx" #define NSECDAY 86400 -#define LOGDEFAULT "/var/adm/streams" +#define LOGDEFAULT "/var/log/streams" #define DIRECTORY 040000 #define ACCESS 07 diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/svc/milestone/fs-minimal --- a/usr/src/cmd/svc/milestone/fs-minimal Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/svc/milestone/fs-minimal Mon May 20 12:59:45 2019 -0400 @@ -32,7 +32,7 @@ . /lib/svc/share/fs_include.sh # Mount other file systems to be available in single user mode. -# Currently, these are /var, /var/adm, /var/run and /tmp. A change +# Currently, these are /var, /var/log, /var/run and /tmp. A change # here will require a modification to the following programs (and # documentation): /sbin/mountall, /sbin/umountall, and # /lib/svc/bin/svc.startd. @@ -44,7 +44,7 @@ be=$special fi -for fs in /var /var/adm /tmp; do +for fs in /var /var/log /tmp; do readvfstab $fs < $vfstab if [ -n "$mountp" ]; then mounted $mountp $mntopts $fstype < /etc/mnttab && continue diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/svc/startd/graph.c --- a/usr/src/cmd/svc/startd/graph.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/svc/startd/graph.c Mon May 20 12:59:45 2019 -0400 @@ -3628,7 +3628,7 @@ } fork_with_timeout("/sbin/umountall -l", 0, 5); - fork_with_timeout("/sbin/umount /tmp /var/adm /var/run /var " + fork_with_timeout("/sbin/umount /tmp /var/log /var/run /var " ">/dev/null 2>&1", 0, 5); /* diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/syslogd/newsyslog --- a/usr/src/cmd/syslogd/newsyslog Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/syslogd/newsyslog Mon May 20 12:59:45 2019 -0400 @@ -28,9 +28,9 @@ # # NOTE: This script is no longer used -- see logadm(8) # -# Running this script checks to see if /var/log/syslog or /var/adm/messages +# Running this script checks to see if /var/log/syslog or /var/log/messages # need rotating, according to the policies in /etc/logadm.conf. Since logadm # normally runs from root's crontab every morning, running this script is no # longer necessary. # -/usr/sbin/logadm /var/log/syslog /var/adm/messages +/usr/sbin/logadm /var/log/syslog /var/log/messages diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/syslogd/syslog.conf --- a/usr/src/cmd/syslogd/syslog.conf Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/syslogd/syslog.conf Mon May 20 12:59:45 2019 -0400 @@ -31,7 +31,7 @@ # containing commas must be quoted. # *.err;kern.notice;auth.notice /dev/sysmsg -*.err;kern.debug;daemon.notice;mail.crit /var/adm/messages +*.err;kern.debug;daemon.notice;mail.crit /var/log/messages *.alert;kern.err;daemon.err operator *.alert root @@ -50,7 +50,7 @@ # ifdef(`LOGHOST', , user.err /dev/sysmsg -user.err /var/adm/messages +user.err /var/log/messages user.alert `root, operator' user.emerg * ) diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/syslogd/syslogd.h --- a/usr/src/cmd/syslogd/syslogd.h Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/syslogd/syslogd.h Mon May 20 12:59:45 2019 -0400 @@ -48,7 +48,7 @@ /* * Various constants & tunable values for syslogd */ -#define DEBUGFILE "/var/adm/syslog.debug" +#define DEBUGFILE "/var/log/syslog.debug" #define MAXLINE 1024 /* maximum line length */ #define DEFUPRI (LOG_USER|LOG_INFO) #define DEFSPRI (LOG_KERN|LOG_CRIT) diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/syslogd/system-log --- a/usr/src/cmd/syslogd/system-log Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/syslogd/system-log Mon May 20 12:59:45 2019 -0400 @@ -76,9 +76,9 @@ /usr/bin/savecore -m -f $DUMPADM_DEVICE fi fi -if [ ! -f /var/adm/messages ]; then - /usr/bin/cp /dev/null /var/adm/messages - /usr/bin/chmod 0644 /var/adm/messages +if [ ! -f /var/log/messages ]; then + /usr/bin/cp /dev/null /var/log/messages + /usr/bin/chmod 0644 /var/log/messages fi remote=`awk -F= ' /^LOG_FROM_REMOTE=[yY][Ee][Ss]/ {print "true"} diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/tip/Makefile --- a/usr/src/cmd/tip/Makefile Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/tip/Makefile Mon May 20 12:59:45 2019 -0400 @@ -8,7 +8,7 @@ # /etc/remote remote host description file # /etc/phones phone number file, owned by uucp and # mode 6?? -# /var/adm/aculog ACU accounting file, owned by uucp and +# /var/log/aculog ACU accounting file, owned by uucp and # mode 6?? (if ACULOG defined) # Presently supports: # BIZCOMP @@ -51,7 +51,7 @@ REMOTE= etc.remote ACULOG= aculog ROOTETCREMOTE= $(ROOTETC)/remote -ROOTACULOGD= $(ROOT)/var/adm +ROOTACULOGD= $(ROOT)/var/log ROOTACULOG= $(ROOTACULOGD)/aculog $(ROOTPROG) := FILEMODE = 4511 diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/cmd/tip/vars.c --- a/usr/src/cmd/tip/vars.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/cmd/tip/vars.c Mon May 20 12:59:45 2019 -0400 @@ -38,7 +38,7 @@ { "host", STRING|IREMOTE|INIT, READ< MAXFILE) return (0); - if (strcmp(newfile, "/var/adm/utmp") == 0 || - strcmp(newfile, "/var/adm/wtmp") == 0) { + if (strcmp(newfile, "/var/log/utmp") == 0 || + strcmp(newfile, "/var/log/wtmp") == 0) { (void) strcpy(name, newfile); (void) strcat(name, "x"); compat_utmpflag = 0; /* turn off old compat mode */ @@ -882,7 +882,7 @@ } /* - * Add record to wtmp (actually wtmpx). If not updating /var/adm/wtmp, + * Add record to wtmp (actually wtmpx). If not updating /var/log/wtmp, * use the old utmp compatibility routine to write a utmp-format * record to the file specified. */ @@ -892,7 +892,7 @@ struct utmpx utmpx; char xfile[MAXFILE + 1]; - if (strcmp(file, "/var/adm/wtmp") == 0) { + if (strcmp(file, "/var/log/wtmp") == 0) { (void) strlcpy(xfile, file, sizeof (xfile) - 1); (void) strcat(xfile, "x"); getutmpx(ut, &utmpx); diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/lib/pam_modules/unix_session/unix_session.c --- a/usr/src/lib/pam_modules/unix_session/unix_session.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/lib/pam_modules/unix_session/unix_session.c Mon May 20 12:59:45 2019 -0400 @@ -54,7 +54,7 @@ #include #include -#define LASTLOG_LEGACY "/var/adm/lastlog" +#define LASTLOG_LEGACY "/var/log/lastlog" struct lastlog_legacy { #ifdef _LP64 time32_t ll_time; diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/lib/smbsrv/libmlsvc/common/eventlog_log.c --- a/usr/src/lib/smbsrv/libmlsvc/common/eventlog_log.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/lib/smbsrv/libmlsvc/common/eventlog_log.c Mon May 20 12:59:45 2019 -0400 @@ -45,7 +45,7 @@ } logr_eventlog_t; logr_eventlog_t logr_eventlog[] = { - { "System", "/var/adm/messages" }, + { "System", "/var/log/messages" }, { "smbd", "/var/smb/smbd_log.txt" }, { "smbrdr", "/var/smb/smbrdr_log.txt" } }; diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/lib/sun_fc/common/Trace.cc --- a/usr/src/lib/sun_fc/common/Trace.cc Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/lib/sun_fc/common/Trace.cc Mon May 20 12:59:45 2019 -0400 @@ -50,8 +50,8 @@ #define MAX_MSG_PREFIX_LEN 128 #define CTIME_LEN 26 -#define DEBUG_FILE "/var/adm/sun_fc.debug" -#define LOG_FILE "/var/adm/sun_fc" +#define DEBUG_FILE "/var/log/sun_fc.debug" +#define LOG_FILE "/var/log/sun_fc" /** * @memo Log a message diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/pkg/manifests/service-resource-pools.inc --- a/usr/src/pkg/manifests/service-resource-pools.inc Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/pkg/manifests/service-resource-pools.inc Mon May 20 12:59:45 2019 -0400 @@ -48,7 +48,7 @@ dir path=usr/share/man/man3lib dir path=usr/share/man/man3pool dir path=var group=sys variant.opensolaris.zone=global -dir path=var/adm/pool group=sys variant.opensolaris.zone=global +dir path=var/log/pool group=sys variant.opensolaris.zone=global dir path=var/log/pool group=sys variant.opensolaris.zone=global driver name=pool perms="pool 0666 root sys" perms="poolctl 0666 root sys" file path=lib/svc/manifest/system/pools.xml group=sys mode=0444 \ diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/pkg/manifests/system-accounting-legacy.mf --- a/usr/src/pkg/manifests/system-accounting-legacy.mf Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/pkg/manifests/system-accounting-legacy.mf Mon May 20 12:59:45 2019 -0400 @@ -51,12 +51,12 @@ dir path=usr/share/man/man4 dir path=usr/share/man/man8 dir path=var group=sys -dir path=var/adm group=sys mode=0775 -dir path=var/adm/acct group=adm mode=0775 owner=adm -dir path=var/adm/acct/fiscal group=adm mode=0775 owner=adm -dir path=var/adm/acct/nite group=adm mode=0775 owner=adm -dir path=var/adm/acct/sum group=adm mode=0775 owner=adm -dir path=var/adm/sa group=sys mode=0775 owner=adm +dir path=var/log group=sys +dir path=var/log/acct group=adm mode=0775 owner=adm +dir path=var/log/acct/fiscal group=adm mode=0775 owner=adm +dir path=var/log/acct/nite group=adm mode=0775 owner=adm +dir path=var/log/acct/sum group=adm mode=0775 owner=adm +dir path=var/log/sa group=sys mode=0775 owner=adm dir path=var/spool dir path=var/spool/cron group=sys dir path=var/spool/cron/crontabs group=sys diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/pkg/manifests/system-core-os.mf --- a/usr/src/pkg/manifests/system-core-os.mf Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/pkg/manifests/system-core-os.mf Mon May 20 12:59:45 2019 -0400 @@ -235,9 +235,6 @@ dir path=usr/share/man/man8 dir path=usr/share/misc dir path=var group=sys -dir path=var/adm group=sys mode=0775 -dir path=var/adm/exacct group=adm owner=adm -dir path=var/adm/streams group=sys dir path=var/cores group=sys dir path=var/cron group=sys dir path=var/games @@ -246,6 +243,8 @@ dir path=var/ld dir path=var/ld/$(ARCH64) dir path=var/log group=sys +dir path=var/log/exacct group=adm owner=adm +dir path=var/log/streams group=sys dir path=var/logadm dir path=var/mail group=mail dir path=var/news @@ -1181,12 +1180,12 @@ file path=usr/share/misc/mail.help file path=usr/share/misc/mail.tildehelp file path=usr/share/misc/more.help -file path=var/adm/aculog mode=0600 owner=uucp preserve=true -file path=var/adm/spellhist mode=0666 preserve=true -file path=var/adm/utmpx preserve=true -file path=var/adm/wtmpx group=adm owner=adm preserve=true +file path=var/log/aculog mode=0600 owner=uucp preserve=true file path=var/log/authlog group=sys mode=0600 preserve=true +file path=var/log/spellhist mode=0666 preserve=true file path=var/log/syslog group=sys preserve=true +file path=var/log/utmpx preserve=true +file path=var/log/wtmpx group=adm owner=adm preserve=true file path=var/saf/zsmon/log group=sys preserve=true file path=var/spool/cron/crontabs/adm group=sys mode=0600 preserve=true file path=var/spool/cron/crontabs/root group=sys mode=0600 preserve=true diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/test/zfs-tests/tests/functional/mount/umountall_001.ksh --- a/usr/src/test/zfs-tests/tests/functional/mount/umountall_001.ksh Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/test/zfs-tests/tests/functional/mount/umountall_001.ksh Mon May 20 12:59:45 2019 -0400 @@ -40,7 +40,7 @@ # This is the list we check the output of umountall -n against. We seed it # with these values because umountall will ignore them, and they're possible # (though most are improbable) ZFS filesystem mountpoints. -zfs_list="/ /lib /sbin /tmp /usr /var /var/adm /var/run" +zfs_list="/ /lib /sbin /tmp /usr /var /var/log /var/run" # Append our ZFS filesystems to the list, not worrying about duplicates. for fs in $(mount -p | awk '{if ($4 == "zfs") print $3}'); do diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/tools/scripts/check_rtime.pl --- a/usr/src/tools/scripts/check_rtime.pl Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/tools/scripts/check_rtime.pl Mon May 20 12:59:45 2019 -0400 @@ -299,7 +299,7 @@ if ($Secure) { # The execution of a secure application over an nfs file # system mounted nosuid will result in warning messages - # being sent to /var/adm/messages. As this type of + # being sent to /var/log/messages. As this type of # environment can occur with root builds, move the file # being investigated to a safe place first. In addition # remove its secure permission so that it can be diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs.conf --- a/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs.conf Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/uts/common/io/fibre-channel/fca/emlxs/emlxs.conf Mon May 20 12:59:45 2019 -0400 @@ -36,7 +36,7 @@ # log-warnings: Sets the verbose level for driver warnings to the system log file*. # log-errors: Sets the verbose level for driver errors to the system log file*. # -# *NOTE: The system log file is normally found at /var/adm/messages. +# *NOTE: The system log file is normally found at /var/log/messages. # # Each parameter is a bit mask that enables/disables specific types of messages. # If the bit is set, then the messages of that type are enabled. diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/uts/common/io/fibre-channel/fca/qlc/qlc.conf --- a/usr/src/uts/common/io/fibre-channel/fca/qlc/qlc.conf Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/uts/common/io/fibre-channel/fca/qlc/qlc.conf Mon May 20 12:59:45 2019 -0400 @@ -208,7 +208,7 @@ #Type: Integer, flag; Range: 0 (disable), 1 (enable); Default: 0 #Usage: This field enables logging of driver detected events occurring # either in the driver or fibre channel bus. Events are logged -# in Solaris /var/adm/messages file. +# in Solaris /var/log/messages file. extended-logging=0; #Name: Firmware Dump Flags diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/uts/common/io/ib/clients/rds/rdsib_debug.c --- a/usr/src/uts/common/io/ib/clients/rds/rdsib_debug.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/uts/common/io/ib/clients/rds/rdsib_debug.c Mon May 20 12:59:45 2019 -0400 @@ -204,7 +204,7 @@ /* * LINTR, L5-L2 message may go to the rds_debug_buf - * L1 messages will go to the /var/adm/messages (debug & non-debug). + * L1 messages will go to the /var/log/messages (debug & non-debug). * L0 messages will go to console (debug & non-debug). */ switch (level) { diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_debug.c --- a/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_debug.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/uts/common/io/ib/clients/rdsv3/rdsv3_debug.c Mon May 20 12:59:45 2019 -0400 @@ -201,7 +201,7 @@ /* * LINTR, L5-L2 message may go to the rdsv3_debug_buf - * L1 messages will go to the /var/adm/messages (debug & non-debug). + * L1 messages will go to the /var/log/messages (debug & non-debug). * L0 messages will go to console (debug & non-debug). */ switch (level) { diff -r 5759ef3a98b8 -r 893b1f7b6690 usr/src/uts/intel/io/acpica/acpica.c --- a/usr/src/uts/intel/io/acpica/acpica.c Mon May 20 15:21:44 2019 -0400 +++ b/usr/src/uts/intel/io/acpica/acpica.c Mon May 20 12:59:45 2019 -0400 @@ -121,7 +121,7 @@ /* * For non-DEBUG builds, set the ACPI CA debug level to 0 - * to quiet chatty BIOS output into /var/adm/messages + * to quiet chatty BIOS output into /var/log/messages * Field-patchable for diagnostic use. */ #ifdef DEBUG @@ -408,7 +408,7 @@ /* * modify default ACPI CA debug output level for non-DEBUG builds - * (to avoid BIOS debug chatter in /var/adm/messages) + * (to avoid BIOS debug chatter in /var/log/messages) */ if (acpica_muzzle_debug_output) AcpiDbgLevel = 0;