diff --git a/board/common/rootfs/etc/profile.d/update-check.sh b/board/common/rootfs/etc/profile.d/update-check.sh index f9aa736a..8cd7424d 100644 --- a/board/common/rootfs/etc/profile.d/update-check.sh +++ b/board/common/rootfs/etc/profile.d/update-check.sh @@ -1,3 +1,3 @@ -if [ -s /run/infix-update ]; then - printf '\n\033[1;33m *** %s ***\033[0m\n\n' "$(cat /run/infix-update)" +if [ -s /run/os-update ]; then + printf '\n\033[1;33m *** %s ***\033[0m\n\n' "$(cat /run/os-update)" fi diff --git a/board/common/rootfs/etc/tmpfiles.d/infix-schedule.conf b/board/common/rootfs/etc/tmpfiles.d/infix-schedule.conf deleted file mode 100644 index f440292d..00000000 --- a/board/common/rootfs/etc/tmpfiles.d/infix-schedule.conf +++ /dev/null @@ -1 +0,0 @@ -f /run/infix-update 0666 admin admin diff --git a/board/common/rootfs/etc/tmpfiles.d/os-schedule.conf b/board/common/rootfs/etc/tmpfiles.d/os-schedule.conf new file mode 100644 index 00000000..56e49080 --- /dev/null +++ b/board/common/rootfs/etc/tmpfiles.d/os-schedule.conf @@ -0,0 +1 @@ +f /run/os-update 0666 admin admin diff --git a/board/common/rootfs/usr/sbin/infix-check-update b/board/common/rootfs/usr/sbin/check-update similarity index 97% rename from board/common/rootfs/usr/sbin/infix-check-update rename to board/common/rootfs/usr/sbin/check-update index 7c6a7fad..f380bf39 100755 --- a/board/common/rootfs/usr/sbin/infix-check-update +++ b/board/common/rootfs/usr/sbin/check-update @@ -2,8 +2,8 @@ # Check for available software updates and notify on login if one exists. # Called by the scheduler. -NOTIFY_FILE=/run/infix-update -TAG=infix-update +NOTIFY_FILE=/run/os-update +TAG=os-update # Source os-release for VERSION and IMAGE_ID if [ ! -f /etc/os-release ]; then diff --git a/src/confd/src/system-software.c b/src/confd/src/system-software.c index 7693b647..50a26549 100644 --- a/src/confd/src/system-software.c +++ b/src/confd/src/system-software.c @@ -94,7 +94,7 @@ static const struct cron_consumer check_update_consumer = { .path = "/ietf-system:system/infix-system:software/check-update", .sched_leaf = "schedule", .enabled_leaf = "enabled", - .command = "/usr/sbin/infix-check-update", + .command = "/usr/sbin/check-update", }; int system_sw_rpc_init(struct confd *confd) diff --git a/src/webui/internal/handlers/dashboard.go b/src/webui/internal/handlers/dashboard.go index 53953e91..e51dfc11 100644 --- a/src/webui/internal/handlers/dashboard.go +++ b/src/webui/internal/handlers/dashboard.go @@ -312,9 +312,9 @@ type diskEntry struct { const internetProbe = "1.1.1.1" // updateNoticeFile holds the software-update notice written by -// /usr/sbin/infix-check-update — the same text the CLI shows at login. +// /usr/sbin/check-update — the same text the CLI shows at login. // A package var so tests can point it elsewhere. -var updateNoticeFile = "/run/infix-update" +var updateNoticeFile = "/run/os-update" var updateURLRe = regexp.MustCompile(`https?://\S+`) @@ -533,7 +533,7 @@ func (h *DashboardHandler) Index(w http.ResponseWriter, r *http.Request) { data.Addresses = ifaceAddresses(ifaces) // Software-update banner: surfaces the same notice as the CLI login - // banner (written by infix-check-update to the notice file). + // banner (written by check-update to the notice file). if msg, url := readUpdateNotice(); msg != "" { data.UpdateAvailable = true data.UpdateMessage = msg