--- a/components/rsyslog/files/rsyslog	Mon Jun 08 13:37:19 2015 -0700
+++ b/components/rsyslog/files/rsyslog	Tue Jun 09 14:56:12 2015 -0700
@@ -1,25 +1,8 @@
 #!/usr/sbin/sh
 #
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
+
 #
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 . /lib/svc/share/smf_include.sh
@@ -58,6 +41,7 @@
 	# previous crash dumps so that messages appear
 	# in chronological order.
 	#
+        # Need to be root to use savecore
 	/usr/bin/savecore -m
 	if [ -r /etc/dumpadm.conf ]; then
 		. /etc/dumpadm.conf
@@ -87,5 +71,4 @@
 	/usr/bin/chown $owner_group $LOGADM_CONF
 fi
 
-# The -c4 argument is needed to silence a compatibility warning.
-/usr/lib/rsyslog/rsyslogd -c4 >/dev/msglog 2>&1 &
+/usr/lib/rsyslog/rsyslogd >/dev/msglog 2>&1