mirror of
https://github.com/kernelkit/infix.git
synced 2026-08-06 07:33:01 +02:00
Joachim Wiberg
3e07c9a960
Turns out the root cause for the odd log message in #896 was that the system did not properly call `resolvconf -u` when starting in failure mode. This patch simplifies the code by moving all `resolvconf -u` calls to the same Finit task. Ensuring it is first launched when confd has successfully consumed any configuration at boot, and then every time a static DNS server is added. (The udhcpc client script already call `resolvconf -u` when dynamic DNS servers are learned.) Fixes #896 Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
32 lines
1.1 KiB
Plaintext
32 lines
1.1 KiB
Plaintext
#set DEBUG=1
|
|
|
|
run name:bootstrap log:prio:user.notice norestart <usr/ixinit> \
|
|
[S] /usr/libexec/confd/bootstrap \
|
|
-- Bootstrapping YANG datastore
|
|
|
|
run name:error :1 log:console norestart if:<run/bootstrap/failure> \
|
|
[S] /usr/libexec/confd/error --
|
|
|
|
service name:confd log:prio:daemon.err <run/bootstrap/success> \
|
|
[S12345] sysrepo-plugind -f -p /run/confd.pid -n -v warning \
|
|
-- Configuration daemon
|
|
|
|
# Bootstrap system with startup-config
|
|
run name:startup log:prio:user.notice norestart <pid/confd> env:/etc/default/confd \
|
|
[S] /usr/libexec/confd/load -t $CONFD_TIMEOUT startup-config \
|
|
-- Loading startup-config
|
|
|
|
# Run if loading startup-config fails for some reason
|
|
run name:failure log:prio:user.critical norestart env:/etc/default/confd \
|
|
if:<run/startup/failure> \
|
|
[S] <pid/confd> /usr/libexec/confd/load -t $CONFD_TIMEOUT failure-config \
|
|
-- Loading failure-config
|
|
|
|
run name:error :2 log:console norestart \
|
|
if:<run/failure/failure> \
|
|
[S] /usr/libexec/confd/error --
|
|
|
|
service name:netopeer notify:none log env:/etc/default/confd \
|
|
[12345] <pid/confd> netopeer2-server -F -t $CONFD_TIMEOUT -v 1 \
|
|
-- NETCONF server
|