logging: add log capture to onboot and service startup

Signed-off-by: Magnus Skjegstad <magnus@skjegstad.com>
This commit is contained in:
Magnus Skjegstad 2017-05-11 21:00:38 +02:00
parent 4a9a5afd03
commit 37ddf42b5b

View File

@ -1,5 +1,9 @@
#!/bin/sh #!/bin/sh
# start memlogd container
/usr/bin/startmemlogd
# start onboot containers, run to completion # start onboot containers, run to completion
if [ -d /containers/onboot ] if [ -d /containers/onboot ]
@ -9,7 +13,7 @@ then
base="$(basename $f)" base="$(basename $f)"
/bin/mount --bind "$f/rootfs" "$f/rootfs" /bin/mount --bind "$f/rootfs" "$f/rootfs"
mount -o remount,rw "$f/rootfs" mount -o remount,rw "$f/rootfs"
/usr/bin/runc run --bundle "$f" "$(basename $f)" /usr/bin/logwrite -n "$(basename $f)" /usr/bin/runc run --bundle "$f" "$(basename $f)"
printf " - $base\n" printf " - $base\n"
done done
fi fi
@ -24,7 +28,7 @@ then
/bin/mount --bind "$f/rootfs" "$f/rootfs" /bin/mount --bind "$f/rootfs" "$f/rootfs"
mount -o remount,rw "$f/rootfs" mount -o remount,rw "$f/rootfs"
log="/var/log/$base.log" log="/var/log/$base.log"
ctr run --runtime-config "$f/config.json" --rootfs "$f/rootfs" --id "$(basename $f)" </dev/null 2>$log >$log & /usr/bin/logwrite -n "$(basename $f)" ctr run --runtime-config "$f/config.json" --rootfs "$f/rootfs" --id "$(basename $f)" </dev/null 2>$log >$log &
printf " - $base\n" printf " - $base\n"
done done
fi fi