Merge branch 'fix_s6' into development

* fix_s6: Add check for usr-merge (Closes hoellen#100)
waja · Dec 13, 2024 · 8431094 · 8431094
2 parents 07eaa42 + 67a4496
commit 8431094
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/rootfs/usr/local/bin/run.sh b/rootfs/usr/local/bin/run.sh
@@ -33,5 +33,9 @@ else
     occ upgrade
 fi
 
-# Run processes
-exec /bin/s6-svscan /etc/s6.d
+# Run processes and check for usr-merge
+if [ -x /usr/bin/s6-svscan ]; then
+    exec /usr/bin/s6-svscan /etc/s6.d
+else
+    exec /bin/s6-svscan /etc/s6.d
+fi