ref: 2b98caa2c4fa3e4890f3a272fa43326861e16e87
parent: 24a662087135196fe58ac85265c5d1b9840c5a3b
author: Timo Teräs <timo.teras@iki.fi>
date: Fri Oct 9 10:54:59 CDT 2015
init: fix bootchart
--- a/bootchartd.in
+++ b/bootchartd.in
@@ -46,7 +46,7 @@
# Enable process accounting if configured
if [ "$PROCESS_ACCOUNTING" = "yes" ]; then
[ -e kernel_pacct ] || : > kernel_pacct
- accton kernel_pacct
+ accton kernel_pacct > /dev/null
fi
# open file descriptors
@@ -98,7 +98,7 @@
i=$(($i + 1))
done
- [ -e kernel_pacct ] && accton
+ [ -e kernel_pacct ] && accton off > /dev/null
}
# Stop the boot logger. The lock file is removed to force the loggers in
@@ -151,19 +151,18 @@
# Package log files
tar -zcf "$BOOTLOG_DEST" header $pacct *.log
- rm "$LOGDIR"/*
- rmdir "$LOGDIR"
+ rm -rf "$LOGDIR"
}
case "$1" in
start-initfs)
NEWROOT="$2"
+ mkdir -p "$LOGDIR"
(
cleanup=true
trap "not_stop_logging=false" USR1
trap "cleanup=false; not_stop_logging=false" USR2
- mkdir "$LOGDIR"
cd "$LOGDIR"
do_logging
if $cleanup; then
@@ -171,18 +170,16 @@
finalize
fi
) &
- echo $! > $LOGDIR/bootchart.pid
+ echo $! > "$LOGDIR"/bootchart.pid
;;
stop-initfs)
NEWROOT="$2"
-
- cd "$LOGDIR"
- mkdir "$NEWROOT$LOGDIR"
- cp /sbin/bootchartd $NEWROOT/sbin
- PID=`cat bootchart.pid`
+ [ -x "$NEWROOT"/sbin/bootchartd ] || cp -a /sbin/bootchartd "$NEWROOT"/sbin
+ rm -rf "$NEWROOT/$LOGDIR"
+ PID=$(cat "$LOGDIR"/bootchart.pid)
kill -USR2 $PID
wait $PID
- mv * "$NEWROOT$LOGDIR"
+ mv "$LOGDIR" "$NEWROOT"
;;
start-rootfs)
(
--- a/features.d/bootchart.files
+++ b/features.d/bootchart.files
@@ -1,3 +1,4 @@
+/sbin/bootchartd
/usr/bin/ac
/usr/bin/last
/usr/bin/lastcomm
@@ -5,4 +6,3 @@
/usr/sbin/dump-acct
/usr/sbin/accton
/usr/sbin/sa
-