lime-system: avoid concurrent execution of lime-config

libremesh · Aug 10, 2014 · 8ca6b9a · 8ca6b9a
1 parent 1243989
commit 8ca6b9a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/packages/lime-system/files/etc/lime-defaults/10-lime_config b/packages/lime-system/files/etc/lime-defaults/10-lime_config
@@ -1,6 +1,3 @@
 #!/bin/sh
-sleep 90s
-echo "Configuring LiMe for first time..."
-lua /usr/bin/lime-config
-uci commit
-reboot
+echo "Configuring LiMe for first time, will take apprex 2 minutes..."
+(sleep 90s ; lua /usr/bin/lime-config && uci commit && reboot)&);
diff --git a/packages/lime-system/files/usr/bin/lime-config b/packages/lime-system/files/usr/bin/lime-config
@@ -9,4 +9,20 @@ function main()
 	for _, module in pairs(modules) do module.configure() end
 end
 
-main()
+
+local lockFilePath = "/var/run/lime-config.pid"
+local lockFile = io.open(lockFilePath,"r")
+if lockFile then
+	lockFile:close()
+	print("lime-config already running")
+else
+	lockFile = io.open(lockFilePath,"w")
+	local statFile = io.open("/proc/self/stat", "r")
+	lockFile:write(statFile:read("*n"))
+	statFile:close()
+
+	main()
+
+	lockFile:close()
+	os.remove(lockFilePath)
+end