Merge pull request #106 from microsoft/argsxtra

Add the ability to provide extra command line arguments to hostapd and netremote-server
microsoft · Jan 12, 2024 · 88f0060 · 88f0060
2 parents b1e39e8 + 48a9dd8
commit 88f0060
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/src/linux/external/hostap/systemd/CMakeLists.txt b/src/linux/external/hostap/systemd/CMakeLists.txt
@@ -7,6 +7,7 @@ configure_file(
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/hostapd@.service.in
     ${CMAKE_CURRENT_BINARY_DIR}/hostapd@.service
+    @ONLY
 )
 
 install(

diff --git a/src/linux/external/hostap/systemd/hostapd@.service.in b/src/linux/external/hostap/systemd/hostapd@.service.in
@@ -6,8 +6,8 @@ After=sys-subsystem-net-devices-%i.device
 [Service]
 Type=forking
 Restart=on-failure
-ExecStart=${CMAKE_INSTALL_FULL_SBINDIR}/hostapd -B -P ${CMAKE_INSTALL_FULL_RUNSTATEDIR}/hostapd/hostapd-%i.pid -i %i ${CMAKE_INSTALL_FULL_SYSCONFDIR}/hostapd/hostapd-%i.conf
-PIDFile=${CMAKE_INSTALL_FULL_RUNSTATEDIR}/hostapd/hostapd-%i.pid
+ExecStart=@CMAKE_INSTALL_FULL_SBINDIR@/hostapd -B -P @CMAKE_INSTALL_FULL_RUNSTATEDIR@/hostapd/hostapd-%i.pid -i %i @CMAKE_INSTALL_FULL_SYSCONFDIR@/hostapd/hostapd-%i.conf ${HOSTAPD_XTRA_ARGS}
+PIDFile=@CMAKE_INSTALL_FULL_RUNSTATEDIR@/hostapd/hostapd-%i.pid
 
 [Install]
 WantedBy=default.target
diff --git a/src/linux/server/systemd/CMakeLists.txt b/src/linux/server/systemd/CMakeLists.txt
@@ -2,6 +2,7 @@
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/netremote-server.service.in
     ${CMAKE_CURRENT_BINARY_DIR}/netremote-server.service
+    @ONLY
 )
 
 install(

diff --git a/src/linux/server/systemd/netremote-server.service.in b/src/linux/server/systemd/netremote-server.service.in
@@ -1,11 +1,12 @@
 [Unit]
 Description=Netremote Daemon
-Requires=hostapd.service
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 Type=simple
 Restart=on-failure
-ExecStart=${CMAKE_INSTALL_FULL_SBINDIR}/netremote-server -d
+ExecStart=@CMAKE_INSTALL_FULL_SBINDIR@/netremote-server -d ${NETREMOTE_SERVER_XTRA_ARGS}
 
 [Install]
 WantedBy=default.target