From 311a2bd3e891f603255d16c77b1c6a8376b7ea05 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 10 Jan 2021 21:54:23 -0500
Subject: [PATCH] update ctrlalloc airframe location

---
 .../init.d-posix/{ => airframes}/10017_iris_ctrlalloc         | 4 ++--
 .../init.d-posix/{ => airframes}/6012_typhoon_ctrlalloc       | 4 ++--
 .../init.d-posix/{ => airframes}/6012_typhoon_ctrlalloc.post  | 0
 ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt     | 3 +++
 .../airframes/{4017_s500_ctrlalloc => 4018_s500_ctrlalloc}    | 4 ++--
 .../{6002_hexa_x_ctrlalloc => 6003_hexa_x_ctrlalloc}          | 4 ++--
 ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt           | 2 ++
 7 files changed, 13 insertions(+), 8 deletions(-)
 rename ROMFS/px4fmu_common/init.d-posix/{ => airframes}/10017_iris_ctrlalloc (94%)
 rename ROMFS/px4fmu_common/init.d-posix/{ => airframes}/6012_typhoon_ctrlalloc (96%)
 rename ROMFS/px4fmu_common/init.d-posix/{ => airframes}/6012_typhoon_ctrlalloc.post (100%)
 rename ROMFS/px4fmu_common/init.d/airframes/{4017_s500_ctrlalloc => 4018_s500_ctrlalloc} (94%)
 rename ROMFS/px4fmu_common/init.d/airframes/{6002_hexa_x_ctrlalloc => 6003_hexa_x_ctrlalloc} (95%)

diff --git a/ROMFS/px4fmu_common/init.d-posix/10017_iris_ctrlalloc b/ROMFS/px4fmu_common/init.d-posix/airframes/10017_iris_ctrlalloc
similarity index 94%
rename from ROMFS/px4fmu_common/init.d-posix/10017_iris_ctrlalloc
rename to ROMFS/px4fmu_common/init.d-posix/airframes/10017_iris_ctrlalloc
index 9dcf7e309a..042c2384c3 100644
--- a/ROMFS/px4fmu_common/init.d-posix/10017_iris_ctrlalloc
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/10017_iris_ctrlalloc
@@ -7,8 +7,8 @@
 # @maintainer Julian Oes <julian@oes.ch>
 #
 
-sh /etc/init.d/rc.mc_defaults
-sh /etc/init.d/rc.ctrlalloc
+. ${R}etc/init.d/rc.mc_defaults
+. ${R}etc/init.d/rc.ctrlalloc
 
 if [ $AUTOCNF = yes ]
 then
diff --git a/ROMFS/px4fmu_common/init.d-posix/6012_typhoon_ctrlalloc b/ROMFS/px4fmu_common/init.d-posix/airframes/6012_typhoon_ctrlalloc
similarity index 96%
rename from ROMFS/px4fmu_common/init.d-posix/6012_typhoon_ctrlalloc
rename to ROMFS/px4fmu_common/init.d-posix/airframes/6012_typhoon_ctrlalloc
index 37139b3252..843a8f01db 100644
--- a/ROMFS/px4fmu_common/init.d-posix/6012_typhoon_ctrlalloc
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/6012_typhoon_ctrlalloc
@@ -5,8 +5,8 @@
 # @type Hexarotor x
 #
 
-sh /etc/init.d/rc.mc_defaults
-sh /etc/init.d/rc.ctrlalloc
+. ${R}etc/init.d/rc.mc_defaults
+. ${R}etc/init.d/rc.ctrlalloc
 
 if [ $AUTOCNF = yes ]
 then
diff --git a/ROMFS/px4fmu_common/init.d-posix/6012_typhoon_ctrlalloc.post b/ROMFS/px4fmu_common/init.d-posix/airframes/6012_typhoon_ctrlalloc.post
similarity index 100%
rename from ROMFS/px4fmu_common/init.d-posix/6012_typhoon_ctrlalloc.post
rename to ROMFS/px4fmu_common/init.d-posix/airframes/6012_typhoon_ctrlalloc.post
diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt b/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt
index 27709dd52b..ca1ab02c07 100644
--- a/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt
+++ b/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt
@@ -33,6 +33,7 @@
 
 px4_add_romfs_files(
 	10016_iris
+	10017_iris_ctrlalloc
 	10020_if750a
 	10030_px4vision
 	1010_iris_opt_flow
@@ -73,4 +74,6 @@ px4_add_romfs_files(
 	2507_cloudship
 	6011_typhoon_h480
 	6011_typhoon_h480.post
+	6012_typhoon_ctrlalloc
+	6012_typhoon_ctrlalloc.post
 )
diff --git a/ROMFS/px4fmu_common/init.d/airframes/4017_s500_ctrlalloc b/ROMFS/px4fmu_common/init.d/airframes/4018_s500_ctrlalloc
similarity index 94%
rename from ROMFS/px4fmu_common/init.d/airframes/4017_s500_ctrlalloc
rename to ROMFS/px4fmu_common/init.d/airframes/4018_s500_ctrlalloc
index 0ce32d4489..02db75dac0 100644
--- a/ROMFS/px4fmu_common/init.d/airframes/4017_s500_ctrlalloc
+++ b/ROMFS/px4fmu_common/init.d/airframes/4018_s500_ctrlalloc
@@ -8,8 +8,8 @@
 # @maintainer Silvan Fuhrer
 #
 
-sh /etc/init.d/rc.mc_defaults
-sh /etc/init.d/rc.ctrlalloc
+. ${R}etcinit.d/rc.mc_defaults
+. ${R}etc/init.d/rc.ctrlalloc
 
 if [ $AUTOCNF = yes ]
 then
diff --git a/ROMFS/px4fmu_common/init.d/airframes/6002_hexa_x_ctrlalloc b/ROMFS/px4fmu_common/init.d/airframes/6003_hexa_x_ctrlalloc
similarity index 95%
rename from ROMFS/px4fmu_common/init.d/airframes/6002_hexa_x_ctrlalloc
rename to ROMFS/px4fmu_common/init.d/airframes/6003_hexa_x_ctrlalloc
index b62c06f45d..3ffdfb673a 100644
--- a/ROMFS/px4fmu_common/init.d/airframes/6002_hexa_x_ctrlalloc
+++ b/ROMFS/px4fmu_common/init.d/airframes/6003_hexa_x_ctrlalloc
@@ -8,8 +8,8 @@
 # @maintainer Silvan Fuhrer
 #
 
-sh /etc/init.d/rc.mc_defaults
-sh /etc/init.d/rc.ctrlalloc
+. ${R}etc/init.d/rc.mc_defaults
+. ${R}etc/init.d/rc.ctrlalloc
 
 if [ $AUTOCNF = yes ]
 then
diff --git a/ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt b/ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt
index 402fa5664c..ee7765e993 100644
--- a/ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt
+++ b/ROMFS/px4fmu_common/init.d/airframes/CMakeLists.txt
@@ -70,6 +70,7 @@ px4_add_romfs_files(
 	4015_holybro_s500
 	4016_holybro_px4vision
 	4017_nxp_hovergames
+	4018_s500_ctrlalloc
 	4020_hk_micro_pcb
 	4030_3dr_solo
 	4031_3dr_quad
@@ -97,6 +98,7 @@ px4_add_romfs_files(
 	# [6000, 6999] Hexarotor x"
 	6001_hexa_x
 	6002_draco_r
+	6003_hexa_x_ctrlalloc
 
 	# [7000, 7999] Hexarotor +"
 	7001_hexa_+