Mercurial > unleashed > wips

changeset 20618:1384e535719c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move /var/svc/log to /var/log/svc
author Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
date Mon, 20 May 2019 17:16:39 -0400
parents 893b1f7b6690
children 1b4935f72a21
files FEATURES.txt share/man/man1/svcs.1 share/man/man5/filesystem.5 share/man/man8/svc.startd.8 usr/src/Targetdirs usr/src/cmd/fm/notify/smtp-notify/common/smtp-notify.c usr/src/cmd/initpkg/init.d/README.rc2 usr/src/cmd/initpkg/init.d/README.rc3 usr/src/cmd/initpkg/init.d/README.rcS usr/src/cmd/logadm/logadm.conf usr/src/cmd/smbsrv/smbd/smbd_syslog.c usr/src/cmd/svc/milestone/manifest-import usr/src/cmd/svc/startd/log.c usr/src/cmd/svc/startd/startd.h usr/src/pkg/manifests/system-core-os.mf
diffstat 15 files changed, 21 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/FEATURES.txt	Mon May 20 12:59:45 2019 -0400
+++ b/FEATURES.txt	Mon May 20 17:16:39 2019 -0400
@@ -13,6 +13,7 @@
  - /etc/[uw]tmpx symlink
  - /usr/adm symlink
  * moved all /var/adm files to /var/log
+ * moved /var/svc/log to /var/log/svc
 
 1.3 release
 -----------
--- a/share/man/man1/svcs.1	Mon May 20 12:59:45 2019 -0400
+++ b/share/man/man1/svcs.1	Mon May 20 17:16:39 2019 -0400
@@ -766,7 +766,7 @@
           svc:/network/nfs/nlockmgr:default
             svc:/network/nfs/status:default
    See: man -M /usr/share/man -s 8 mount_nfs
-   See: /var/svc/log/network-nfs-client:default.log
+   See: /var/log/svc/network-nfs-client:default.log
 Impact: This service is not running.
 .fi
 .in -2
--- a/share/man/man5/filesystem.5	Mon May 20 12:59:45 2019 -0400
+++ b/share/man/man5/filesystem.5	Mon May 20 17:16:39 2019 -0400
@@ -1113,7 +1113,7 @@
 .sp
 .ne 2
 .na
-\fB\fB/var/svc/log\fR\fR
+\fB\fB/var/log/svc\fR\fR
 .ad
 .sp .6
 .RS 4n
--- a/share/man/man8/svc.startd.8	Mon May 20 12:59:45 2019 -0400
+++ b/share/man/man8/svc.startd.8	Mon May 20 17:16:39 2019 -0400
@@ -96,7 +96,7 @@
 \fIastring\fR (as defined in \fBscf_value_is_type\fR; see
 \fBscf_value_is_type\fR(3SCF)) that describes the default level of messages to
 log to \fBsyslog\fR (see \fBsyslog\fR(3C) and \fBsvc.startd\fR's global
-logfile, \fB/var/svc/log/svc.startd.log\fR. The supported message options
+logfile, \fB/var/log/svc/svc.startd.log\fR. The supported message options
 include \fBquiet\fR, \fBverbose\fR, and \fBdebug\fR. The \fBquiet\fR option
 sends error messages requiring administrative intervention to the console,
 \fBsyslog\fR and \fBsvc.startd\fR's global logfile. The \fBverbose\fR option
@@ -245,8 +245,8 @@
 .LP
 By default, \fBsvc.startd\fR provides logging of significant restarter actions
 for the service as well as method standard output and standard error file
-descriptors to \fB/var/svc/log/\fIservice\fR:\fIinstance\fR.log\fR. The level
-of logging to system global locations like \fB/var/svc/log/svc.startd.log\fR
+descriptors to \fB/var/log/svc/\fIservice\fR:\fIinstance\fR.log\fR. The level
+of logging to system global locations like \fB/var/log/svc/svc.startd.log\fR
 and \fBsyslog\fR is controlled by the \fBoptions/logging\fR property.
 .SS "SERVICE DEFINITION"
 .sp
@@ -545,7 +545,7 @@
 .sp
 .ne 2
 .na
-\fB\fB/var/svc/log\fR\fR
+\fB\fB/var/log/svc\fR\fR
 .ad
 .RS 21n
 Directory where \fBsvc.startd\fR stores log files.
--- a/usr/src/Targetdirs	Mon May 20 12:59:45 2019 -0400
+++ b/usr/src/Targetdirs	Mon May 20 17:16:39 2019 -0400
@@ -295,6 +295,7 @@
 	/var/log/pool \
 	/var/log/sa \
 	/var/log/streams \
+	/var/log/svc \
 	/var/logadm \
 	/var/mail \
 	/var/news \
@@ -312,7 +313,6 @@
 	/var/spool/cron/atjobs \
 	/var/spool/cron/crontabs \
 	/var/svc \
-	/var/svc/log \
 	/var/svc/manifest \
 	/var/svc/manifest/milestone \
 	/var/svc/manifest/device \
--- a/usr/src/cmd/fm/notify/smtp-notify/common/smtp-notify.c	Mon May 20 12:59:45 2019 -0400
+++ b/usr/src/cmd/fm/notify/smtp-notify/common/smtp-notify.c	Mon May 20 17:16:39 2019 -0400
@@ -60,7 +60,7 @@
  * # svccfg -s svc:/system/fm/smtp-notify setprop config/debug=true
  *
  * Debug messages will be spooled to the service log at:
- * <root>/var/svc/log/system-fm-smtp-notify:default.log
+ * <root>/var/log/svc/system-fm-smtp-notify:default.log
  */
 #define	PP_SCRIPT "usr/lib/fm/notify/process_msg_template.sh"
 
--- a/usr/src/cmd/initpkg/init.d/README.rc2	Mon May 20 12:59:45 2019 -0400
+++ b/usr/src/cmd/initpkg/init.d/README.rc2	Mon May 20 17:16:39 2019 -0400
@@ -38,14 +38,14 @@
 earlier single user milestone.  Any warnings, errors, or output from the
 scripts in /etc/rc2.d/ are logged to the file:
 
-/var/svc/log/milestone-multi-user:default.log
+/var/log/svc/milestone-multi-user:default.log
 
 If the system is changing from a higher run-level (for example, through
 an invocation of "init 2"), SMF executes all 'K' scripts within
 /etc/rc2.d/ with the argument 'stop'.  Any warnings, errors, or output
 from these scripts are logged to the file:
 
-/var/svc/log/rc2.log
+/var/log/svc/rc2.log
 
 Scripts in /etc/rc2.d/ may assume the following:
 
--- a/usr/src/cmd/initpkg/init.d/README.rc3	Mon May 20 12:59:45 2019 -0400
+++ b/usr/src/cmd/initpkg/init.d/README.rc3	Mon May 20 17:16:39 2019 -0400
@@ -39,7 +39,7 @@
 been run as part of the earlier major milestones.  Any warnings, errors,
 or output from the scripts in /etc/rc3.d/ are logged to the file:
 
-/var/svc/log/milestone-multi-user-server:default.log
+/var/log/svc/milestone-multi-user-server:default.log
 
 Scripts in /etc/rc3.d/ may assume the following:
 
--- a/usr/src/cmd/initpkg/init.d/README.rcS	Mon May 20 12:59:45 2019 -0400
+++ b/usr/src/cmd/initpkg/init.d/README.rcS	Mon May 20 17:16:39 2019 -0400
@@ -36,14 +36,14 @@
 'S' script within /etc/rcS.d/ with the argument 'start'.  Any warnings,
 errors, or output from these scripts are logged to the file:
 
-/var/svc/log/milestone-single-user:default.log
+/var/log/svc/milestone-single-user:default.log
 
 If the system is changing from a higher run-level (for example, through
 an invocation of "init S"), SMF executes all 'K' scripts within
 /etc/rcS.d/ with the argument 'stop'. Any warnings, errors, or output
 from these scripts are logged to the file:
 
-/var/svc/log/rcS.log
+/var/log/svc/rcS.log
 
 Scripts in /etc/rcS.d/ may assume the following:
 
--- a/usr/src/cmd/logadm/logadm.conf	Mon May 20 12:59:45 2019 -0400
+++ b/usr/src/cmd/logadm/logadm.conf	Mon May 20 17:16:39 2019 -0400
@@ -41,7 +41,7 @@
 /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'
 /var/fm/fmd/fltlog -N -A 6m -s 10m -M '/usr/sbin/fmadm -q rotate fltlog && mv /var/fm/fmd/fltlog.0- $nfile'
-smf_logs /var/svc/log/*.log -C 8 -s 1m -c
+smf_logs /var/log/svc/*.log -C 8 -s 1m -c
 #
 # The entry below is used by turnacct(8)
 #
--- a/usr/src/cmd/smbsrv/smbd/smbd_syslog.c	Mon May 20 12:59:45 2019 -0400
+++ b/usr/src/cmd/smbsrv/smbd/smbd_syslog.c	Mon May 20 17:16:39 2019 -0400
@@ -65,7 +65,7 @@
 /*
  * Provide a replacement for libsmb:smb_vsyslog() that prints messages
  * both to the normal sysloc(3c), and to stdout, which ends up in:
- *  /var/svc/log/network-smb-server:default.log
+ *  /var/log/svc/network-smb-server:default.log
  * It's much easier to follow debug messages in the service log.
  */
 void
--- a/usr/src/cmd/svc/milestone/manifest-import	Mon May 20 12:59:45 2019 -0400
+++ b/usr/src/cmd/svc/milestone/manifest-import	Mon May 20 17:16:39 2019 -0400
@@ -229,7 +229,7 @@
 
 		if [ $failures -eq 0 -a "$console_print" = "true" ]; then
 			msg="svccfg import warnings.  See"
-			msg="$msg /var/svc/log/system-manifest-import:default.log ."
+			msg="$msg /var/log/svc/system-manifest-import:default.log ."
 			echo $msg > /dev/msglog
 		fi
 	fi
--- a/usr/src/cmd/svc/startd/log.c	Mon May 20 12:59:45 2019 -0400
+++ b/usr/src/cmd/svc/startd/log.c	Mon May 20 17:16:39 2019 -0400
@@ -29,8 +29,8 @@
  *
  * Logging destinations
  *   svc.startd(8) supports three logging destinations:  the system log, a
- *   daemon-specific log (in the /var/svc/log hierarchy by default), and to the
- *   standard output (redirected to the /var/svc/log/svc.startd.log file by
+ *   daemon-specific log (in the /var/log/svc hierarchy by default), and to the
+ *   standard output (redirected to the /var/log/svc/svc.startd.log file by
  *   default).  Any or all of these destinations may be used to
  *   communicate a specific message; the audiences for each destination differ.
  *
--- a/usr/src/cmd/svc/startd/startd.h	Mon May 20 12:59:45 2019 -0400
+++ b/usr/src/cmd/svc/startd/startd.h	Mon May 20 17:16:39 2019 -0400
@@ -188,7 +188,7 @@
 extern mode_t dmask;
 
 #define	LOG_PREFIX_EARLY	"/etc/svc/volatile/"
-#define	LOG_PREFIX_NORMAL	"/var/svc/log/"
+#define	LOG_PREFIX_NORMAL	"/var/log/svc/"
 
 #define	LOG_SUFFIX		".log"
 
--- a/usr/src/pkg/manifests/system-core-os.mf	Mon May 20 12:59:45 2019 -0400
+++ b/usr/src/pkg/manifests/system-core-os.mf	Mon May 20 17:16:39 2019 -0400
@@ -245,6 +245,7 @@
 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/log/svc group=sys
 dir path=var/logadm
 dir path=var/mail group=mail
 dir path=var/news
@@ -258,7 +259,6 @@
 dir path=var/spool/cron/atjobs group=sys
 dir path=var/spool/cron/crontabs group=sys
 dir path=var/svc group=sys
-dir path=var/svc/log group=sys
 dir path=var/svc/manifest group=sys
 dir path=var/svc/manifest/application group=sys
 dir path=var/svc/manifest/application/management group=sys