ntpd section isn't shown in LuCI as there is no /usr/sbin/ntpd

I'm not quite sure what we would like to achieve with https://gitlab.labs.nic.cz/turris/turris-build/blob/master/patches/openwrt/hack/0003-busybox-Try-to-install-everything-into-s-bin.patch as there is no commit message.

Unfortunately, with that patch we diverged a little bit from OpenWrt and LuCI doesn't count with that. In LuCI, there is a hard-coded path, which is looking for /usr/sbin/ntpd , if it's not there then it doesn't show ntpd section, but we have it in /sbin/ntpd. That's why I need to add /sbin/ntpd to LuCI and LuCI seems to be happy about it as it works.

This is an issue across all our Turris OS releases.

Forum related thread: https://forum.turris.cz/t/ntp-server-choice-removed/10405/13?u=pepe

added Bug v4.x v5.x labels

changed the description

Would it not be more suitable to back out the initial patch and stay aligned with upstream for this sort of packages? Now it needs a patch for the patch. If upstream changes ntpd a/o LuCI it could lead to more debugging/patching etc.

Wasn't TO4.x and later meant to lessen the load for TO on carrying/maintaining patches?

That patch is required because otherwise it is not possible to install full coreutils because they collide with busybox. There is no simple solution other then to repackage Busybox. This is upstream bug that is suppose to be fixed in master. We can drop that patch in master but that won't fix in TOS 4.x as busybox would still collide with coreutils and more. This is just problem that does not have simple solution.

We still have to investigate if upstream really fixed this problem and if we can safely drop this patch.

We still have to investigate if upstream really fixed this problem and if we can safely drop this patch.

Hmm, with Master image builder https://github.com/openwrt/packages/issues/9290

LGTM

assigned to @jschlehofer

merged

Just for reference:

Turris OS 3.x: https://gitlab.labs.nic.cz/turris/luci-cs/commit/ad82eacfaca99ddf71169b419e1e338de2eade4a

OpenWrt 18.06: https://gitlab.labs.nic.cz/turris/turris-build/commit/af803291d15794b951c63e8d7aceafe964df7442

OpenWrt 19.06: https://gitlab.labs.nic.cz/turris/turris-build/commit/fc4f61f6e0a846c4e1c4fd58e4af782c6685def4