From a0a68d9a7a0825047b8f01e0b83702daca8ea727 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Fri, 30 Nov 2018 20:03:52 -0800 Subject: [PATCH] Use netconsoleTee instead of netconsoleServer --- copyextfiles.sh | 2 +- stage2/01-sys-tweaks/01-run.sh | 2 +- stage2/01-sys-tweaks/files/camera_run | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/copyextfiles.sh b/copyextfiles.sh index dd2f795..9de32ef 100755 --- a/copyextfiles.sh +++ b/copyextfiles.sh @@ -52,6 +52,6 @@ sh -c 'cd ../allwpilib/cameraserver/src/main/native/include && tar czf - cameras cp \ ../allwpilib/cameraserver/build/exe/multiCameraServer/raspbian/multiCameraServer \ - ../allwpilib/wpiutil/build/exe/netconsoleServer/raspbian/netconsoleServer \ + ../allwpilib/wpiutil/build/exe/netconsoleTee/raspbian/netconsoleTee \ ../allwpilib/wpiutil/build/exe/rpiConfigServer/raspbian/rpiConfigServer \ stage2/01-sys-tweaks/extfiles/ diff --git a/stage2/01-sys-tweaks/01-run.sh b/stage2/01-sys-tweaks/01-run.sh index 7771e43..7e7ba10 100755 --- a/stage2/01-sys-tweaks/01-run.sh +++ b/stage2/01-sys-tweaks/01-run.sh @@ -113,7 +113,7 @@ install -m 755 files/configServer_run "${ROOTFS_DIR}/service/configServer/run" install -m 755 extfiles/rpiConfigServer "${ROOTFS_DIR}/usr/local/sbin/configServer" -install -m 755 extfiles/netconsoleServer "${ROOTFS_DIR}/usr/local/bin/" +install -m 755 extfiles/netconsoleTee "${ROOTFS_DIR}/usr/local/bin/" install -v -d "${ROOTFS_DIR}/service/camera" diff --git a/stage2/01-sys-tweaks/files/camera_run b/stage2/01-sys-tweaks/files/camera_run index 5d72da8..5d61245 100755 --- a/stage2/01-sys-tweaks/files/camera_run +++ b/stage2/01-sys-tweaks/files/camera_run @@ -1,4 +1,4 @@ #!/bin/sh sleep 1 cd /home/pi -exec pgrphack /usr/local/bin/setuidgids pi /usr/local/bin/netconsoleServer -u ./runCamera +exec pgrphack /usr/local/bin/setuidgids pi ./runCamera 2>&1 | /usr/local/bin/netconsoleTee -u