2024-06-11 22:26:16 +02:00
|
|
|
Index: sysstat-12.7.5/sa1.in
|
2017-02-19 11:24:47 +01:00
|
|
|
===================================================================
|
2024-06-11 22:26:16 +02:00
|
|
|
--- sysstat-12.7.5.orig/sa1.in
|
|
|
|
+++ sysstat-12.7.5/sa1.in
|
2022-05-30 11:17:02 +02:00
|
|
|
@@ -31,8 +31,14 @@ then
|
|
|
|
LONG_NAME=y
|
2007-02-08 08:57:37 +01:00
|
|
|
fi
|
2013-11-05 12:23:43 +01:00
|
|
|
|
2007-02-08 08:57:37 +01:00
|
|
|
+set -e
|
2007-03-15 01:50:14 +01:00
|
|
|
ENDIR=@SA_LIB_DIR@
|
2007-02-08 08:57:37 +01:00
|
|
|
cd ${ENDIR}
|
2011-10-27 10:22:27 +02:00
|
|
|
+LOCKFILE=/var/run/sysstat/sadc.LOCK
|
|
|
|
+mkdir -p /var/run/sysstat
|
2009-06-10 14:57:42 +02:00
|
|
|
+lockfile -r2 -30 "$LOCKFILE" 2>/dev/null
|
|
|
|
+trap "/bin/rm -f $LOCKFILE" EXIT
|
2007-02-08 08:57:37 +01:00
|
|
|
+
|
2007-04-18 01:00:01 +02:00
|
|
|
[ "$1" = "--boot" ] && shift && BOOT=y || BOOT=n
|
2020-08-16 23:50:17 +02:00
|
|
|
[ "$1" = "--sleep" ] && shift && SLEEP=y || SLEEP=n
|
2022-05-30 11:17:02 +02:00
|
|
|
|
|
|
|
@@ -51,13 +57,13 @@ fi
|
|
|
|
|
2020-08-16 23:50:17 +02:00
|
|
|
if [ "${SLEEP}" = "y" ]
|
2020-08-31 13:44:15 +02:00
|
|
|
then
|
|
|
|
- exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} -C "LINUX SLEEP MODE ($*)" ${SA_DIR}
|
|
|
|
+ ${ENDIR}/sadc -F -L ${SADC_OPTIONS} -C "LINUX SLEEP MODE ($*)" ${SA_DIR}
|
|
|
|
elif [ $# = 0 ] && [ "${BOOT}" = "n" ]
|
|
|
|
then
|
2007-02-08 08:57:37 +01:00
|
|
|
# Note: Stats are written at the end of previous file *and* at the
|
|
|
|
# beginning of the new one (when there is a file rotation) only if
|
2022-05-30 11:17:02 +02:00
|
|
|
# outfile has not been explicitly specified on the command line...
|
2014-07-18 06:40:12 +02:00
|
|
|
- exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 ${SA_DIR}
|
2020-08-16 23:50:17 +02:00
|
|
|
+ ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 ${SA_DIR}
|
2007-02-08 08:57:37 +01:00
|
|
|
else
|
2014-07-18 06:40:12 +02:00
|
|
|
- exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* ${SA_DIR}
|
2020-08-16 23:50:17 +02:00
|
|
|
+ ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* ${SA_DIR}
|
2007-02-08 08:57:37 +01:00
|
|
|
fi
|
2024-06-11 22:26:16 +02:00
|
|
|
Index: sysstat-12.7.5/sa2.in
|
2017-02-19 11:24:47 +01:00
|
|
|
===================================================================
|
2024-06-11 22:26:16 +02:00
|
|
|
--- sysstat-12.7.5.orig/sa2.in
|
|
|
|
+++ sysstat-12.7.5/sa2.in
|
2020-08-16 23:50:17 +02:00
|
|
|
@@ -59,6 +59,17 @@ fi
|
2007-02-08 08:57:37 +01:00
|
|
|
|
2017-02-19 11:24:47 +01:00
|
|
|
[ -f "${DFILE}" ] || exit 0
|
2007-02-08 08:57:37 +01:00
|
|
|
cd ${ENDIR}
|
|
|
|
+
|
2011-10-27 10:22:27 +02:00
|
|
|
+LOCKFILE=/var/run/sysstat/sadc.LOCK
|
|
|
|
+mkdir -p /var/run/sysstat
|
2007-02-08 08:57:37 +01:00
|
|
|
+if ! lockfile -r6 -600 $LOCKFILE 2>/dev/null; then
|
|
|
|
+ if test `find $LOCKFILE -mmin +180 2>/dev/null`; then
|
|
|
|
+ rm -f $LOCKFILE
|
|
|
|
+ logger -p cron.alert "$0: detected an old lockfile \"$LOCKFILE\"."
|
|
|
|
+ fi
|
|
|
|
+fi
|
2009-06-10 14:57:42 +02:00
|
|
|
+trap "/bin/rm -f $LOCKFILE" EXIT
|
2007-02-08 08:57:37 +01:00
|
|
|
+
|
2017-02-19 11:24:47 +01:00
|
|
|
if [ x${REPORTS} != xfalse ]
|
|
|
|
then
|
2024-06-11 22:26:16 +02:00
|
|
|
S_REPEAT_HEADER=${REPEAT_HEADER} ${ENDIR}/sar $* -f ${DFILE} > ${RPT}
|