Просмотр исходного кода

procd: reload_config: support UCI overlay directory

Check /var/run/uci/ before /etc/config/ so that overlay configs
also trigger service reload events.

The overlay directory takes precedence, and uci show already handles
merging overlay + base configuration correctly.

Signed-off-by: John Crispin <[email protected]>
John Crispin 2 недель назад
Родитель
Сommit
aaa2d9f1e5
1 измененных файлов с 4 добавлено и 2 удалено
  1. 4 2
      package/system/procd/files/reload_config

+ 4 - 2
package/system/procd/files/reload_config

@@ -1,9 +1,11 @@
 #!/bin/sh
 rm -rf /var/run/config.check
 mkdir -p /var/run/config.check
-for config in /etc/config/*; do
+for config in /var/run/uci/* /etc/config/*; do
+	[ -f "$config" ] || continue
 	file=${config##*/}
-	uci show "${file##*/}" > /var/run/config.check/$file
+	[ -f "/var/run/config.check/$file" ] && continue
+	uci show "$file" > /var/run/config.check/$file 2>/dev/null
 done
 MD5FILE=/var/run/config.md5
 [ -f $MD5FILE ] && {