-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
luci-base: conversion of ucitrack handling from uci to json #7056
Conversation
In general this seems fine. In your commit messages please change |
8551aef
to
f1c553f
Compare
The 'ucitrack' configuration under '/etc/config' defines which service must be restarted on a LuCI change. This uci file defines how all this works together. Additionally there are 'uci-defaults' scripts in the various applications that add additional configurations parameters to this ucitrack file if a service must be reloaded/restarted on a LuCI change. There are some problems with the current implementation: * The uci should be used to configure the system and not for this kind of reload/restart dependency handling on LuCI changes. * On a system update with configuration restore of the 'ucitrack' file the new behavior on LuCI reload/restart could not take into account because the new file is *not* used. This commit converts the handling from uci to json. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This script is no longer needed and can therefore be deleted. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
The 'ucitrack' file is not available anymore this changes is not needed. Therefore, this 'uci-defaults' script is deleted. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
The 'ucitrack' file is not available anymore this changes are not needed. Therefore, this 'uci-defaults' script is deleted. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
The 'ucitrack' file is not available anymore this changes are not needed. Therefore, this 'uci-defaults' script is deleted. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
The 'ucitrack' file is not available anymore this changes are not needed. Therefore, this 'uci-defaults' script is deleted. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Conversion of the 'uci-defaults' script for ucitrack handling to the new json processing. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Conversion of the 'uci-defaults' script for ucitrack handling to the new json processing. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Conversion of the 'uci-defaults' script for ucitrack handling to the new json processing. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
… json Conversion of the 'uci-defaults' script for ucitrack handling to the new json processing. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
…e json Conversion of the 'uci-defaults' script for ucitrack handling to the new json processing. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
…json Conversion of the 'uci-defaults' script for ucitrack handling to the new json processing. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
… json Conversion of the 'uci-defaults' script for ucitrack handling to the new json processing. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Conversion of the 'uci-defaults' script for ucitrack handling to the new json processing. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Conversion of the 'uci-defaults' script for ucitrack handling to the new json processing. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
The 'ucitrack' file is not available anymore this changes are not needed. Therefore, this 'uci-defaults' script is deleted. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
The 'ucitrack' file is not available anymore this changes are not needed. Therefore, this 'uci-defaults' script is deleted. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
In the whole OpenWrt there is no httpd uci config, this must be a leftover from before uhttpd and can therefore be deleted. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
In the whole OpenWrt there is no ntpclient uci config, this must be a leftover and can therefore be deleted. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
In the whole OpenWrt there is no olsr uci config, this must be a leftover and can therefore be deleted. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Move the json file to where it belongs. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Move the json file to where it belongs. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Move the json file to where it belongs. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Move the json file to where it belongs. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Move the json file to where it belongs. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Move the json file to where it belongs. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Move the json file to where it belongs. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Move the json file to where it belongs. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Move the json file to where it belongs. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Move the json file to where it belongs. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Move the json file to where it belongs. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Move the json file to where it belongs. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Move the json file to where it belongs. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
f1c553f
to
4cffc9f
Compare
For those out there (posterity, and googlers who find this) who have PRs in the works, they just migrate from ucitrack to json file and everything just 'works'? Delete this: #!/bin/sh
uci -q batch <<-EOF >/dev/null
delete ucitrack.@app[-1]
add ucitrack app
set ucitrack.@app[-1].init=appd
commit ucitrack
EOF
exit 0 Do this: {
"config": "appd",
"init": "appd"
} (How) Does one handle the following in JSON? e.g. #!/bin/sh
rm -f /tmp/luci-indexcache
exit 0 |
I also did not understand this bit:
|
This is no longer needed. We already add this to every package in luci.mk in general. See the following lines in Lines 227 to 230 in 291dd24
This means that if I keep the |
Description:
The
ucitrack
configuration under/etc/config
defines which service must be restarted on aLuCI
change. Thisuci
file defines how all this works together. Additionally there areuci-defaults
scripts in the various applications that add additional configurations parameters to thisucitrack
file if a service must be reloaded/restarted if auci
change was made in this application.There are some problems with the current implementation:
uci
should be used to configure the system and not for this kind of reload/restart dependency handling onLuCI
changes.uci
fileucitrack
the new behavior onLuCI
reload/restart could not take into account because the new file is not be used.In these two repositories, the change must then also be made after the merge.
openwrt/packages#23879
openwrt/routing#1062
Signed-off-by: <my@email.address>
row (viagit commit --signoff
)<package name>: title
first line subject for packages