From 4aeb70fcfeb390b99fecb6337aa3a077a0244af6 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 17 Feb 2018 11:14:46 -0500
Subject: [PATCH] rcS move logger startup to rc.logging and end of init

 - fixes #8903
---
 ROMFS/px4fmu_common/init.d/rc.logging | 33 +++++++++++++++++++++++++++
 ROMFS/px4fmu_common/init.d/rcS        | 32 ++------------------------
 2 files changed, 35 insertions(+), 30 deletions(-)
 create mode 100644 ROMFS/px4fmu_common/init.d/rc.logging

diff --git a/ROMFS/px4fmu_common/init.d/rc.logging b/ROMFS/px4fmu_common/init.d/rc.logging
new file mode 100644
index 0000000000..909bcc4b1a
--- /dev/null
+++ b/ROMFS/px4fmu_common/init.d/rc.logging
@@ -0,0 +1,33 @@
+#!nsh
+# Logging
+#
+# Standard startup script for logging
+#
+
+if param compare SYS_LOGGER 0
+then
+	sdlog2 start -r 100 -a -b 9 -t
+else
+	set LOGGER_ARGS ""
+
+	if param compare SDLOG_MODE 1
+	then
+		set LOGGER_ARGS "-e"
+	fi
+
+	if param compare SDLOG_MODE 2
+	then
+		set LOGGER_ARGS "-f"
+	fi
+
+	if ver hwcmp AEROFC_V1
+	then
+		set LOGGER_ARGS "-m mavlink"
+	fi
+
+	logger start -b ${LOGGER_BUF} -t ${LOGGER_ARGS}
+
+	unset LOGGER_ARGS
+fi
+
+unset LOGGER_BUF
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index b6e3c9a4d4..a136dc4a88 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -693,36 +693,6 @@ then
 		mavlink start -r 800000 -d /dev/ttyACM0 -m config -x
 	fi
 
-	#
-	# Logging
-	#
-	if param compare SYS_LOGGER 0
-	then
-		sdlog2 start -r 100 -a -b 9 -t
-	else
-		set LOGGER_ARGS ""
-
-		if param compare SDLOG_MODE 1
-		then
-			set LOGGER_ARGS "-e"
-		fi
-
-		if param compare SDLOG_MODE 2
-		then
-			set LOGGER_ARGS "-f"
-		fi
-
-		if ver hwcmp AEROFC_V1
-		then
-			set LOGGER_ARGS "-m mavlink"
-		fi
-
-		logger start -b ${LOGGER_BUF} -t ${LOGGER_ARGS}
-
-		unset LOGGER_BUF
-		unset LOGGER_ARGS
-	fi
-
 	#
 	# Fixed wing setup
 	#
@@ -967,6 +937,8 @@ then
 		fi
 	fi
 
+	sh /etc/init.d/rc.logging
+
 # End of autostart
 fi