mirror of
https://github.com/kernelkit/infix.git
synced 2026-07-22 01:13:00 +02:00
fix: remove infix from commands and state files
Signed-off-by: Ejub Sabic <ejub1946@outlook.com>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
f /run/infix-update 0666 admin admin
|
||||
@@ -0,0 +1 @@
|
||||
f /run/os-update 0666 admin admin
|
||||
+2
-2
@@ -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
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user