[solaris init scripts] save the coredump into the $DUMPADM_DEVICE onl…

…y if it exists when this environment variable is valid (not 0 length and device exists)
eric · Mar 22, 2010 · f837b6e · f837b6e
1 parent 563fd7f
commit f837b6e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/contrib/balabit-initscripts/init.d b/contrib/balabit-initscripts/init.d
@@ -266,11 +266,15 @@ case $OS in
 			# Before syslog-ng starts, save any messages from previous
 			# crash dumps so that messages appear in chronological order.
 			#
-			/usr/bin/savecore -m
+                        if [ -r /dev/dump ]; then
+                                /usr/bin/savecore -m
+                        fi
 			if [ -r /etc/dumpadm.conf ]; then
 				. /etc/dumpadm.conf
-				[ "x$DUMPADM_DEVICE" != xswap ] && \
-				    /usr/bin/savecore -m -f $DUMPADM_DEVICE
+                                if [ -n "$DUMPADM_DEVICE" ] && [ -r "$DUMPADM_DEVICE" ] && \
+                                   [ "x$DUMPADM_DEVICE" != xswap ]; then
+                                        /usr/bin/savecore -m -f $DUMPADM_DEVICE
+                                fi
 			fi
 		;;
 	HP-UX)

diff --git a/contrib/solaris-packaging/syslog-ng.method b/contrib/solaris-packaging/syslog-ng.method
@@ -95,11 +95,15 @@ slng_start () {
                 # Before syslog-ng starts, save any messages from previous
                 # crash dumps so that messages appear in chronological order.
                 #
-                /usr/bin/savecore -m
+                if [ -r /dev/dump ]; then
+                    /usr/bin/savecore -m
+                fi
                 if [ -r /etc/dumpadm.conf ]; then
-                        . /etc/dumpadm.conf
-                        [ "x$DUMPADM_DEVICE" != xswap ] && \
-                            /usr/bin/savecore -m -f $DUMPADM_DEVICE
+                    . /etc/dumpadm.conf
+                    if [ -n "$DUMPADM_DEVICE" ] && [ -r "$DUMPADM_DEVICE" ] && \
+                       [ "x$DUMPADM_DEVICE" != xswap ]; then
+                        /usr/bin/savecore -m -f $DUMPADM_DEVICE
+                    fi
                 fi
                 check_syntax
                 $SYSLOGNG $OPTIONS