summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVianney Bouchaud2023-09-25 21:37:53 +0200
committerVianney Bouchaud2023-09-25 21:37:53 +0200
commite8adc582ddc1ca2aba727277fbbb4431ab5d6450 (patch)
treead53eeb158963ad472479cb407d09aca2b22b568
parent8c8eb19cd637014e0a3a3fbab7259daa9bb10efe (diff)
downloadaur-e8adc582ddc1ca2aba727277fbbb4431ab5d6450.tar.gz
upgpkg: kured-sentinel 2.0.0-1
upstream release changing pacman hook to create a file to a sentinel script
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD12
-rwxr-xr-xkured-sentinel24
-rw-r--r--kured-sentinel.hook10
4 files changed, 26 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 61c2082c2b19..94da678c29b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,13 @@
pkgbase = kured-sentinel
- pkgdesc = Pacman hook to create the sentinel file for kured.
- pkgver = 1.0.1
- pkgrel = 2
+ pkgdesc = Sentinel script for Kured - Kubernetes Reboot Daemon
+ pkgver = 2.0.0
+ pkgrel = 1
url = https://github.com/vbouchaud/aur/tree/main/kured-sentinel
arch = any
license = MIT
- depends = longoverdue
source = LICENSE::https://bouchaud.org/misc/MIT.txt
source = kured-sentinel
- source = kured-sentinel.hook
sha256sums = 35e3cbe726e28f2f624acbe4fce8af09715e55537df7aa22ac89f00cde399515
- sha256sums = 7adee67c790d12201ff5593e1b471e7fcacb34942a253dc2bc7b4cdb2b1a55bd
- sha256sums = 1a479269137b31a0143bfd53b834fd34549d4aedaac19004e1d8bac19ef66500
+ sha256sums = 066e168bc38d99cce7937098ecbc094eae1a6671733cdfced0c8d76b987da873
pkgname = kured-sentinel
diff --git a/PKGBUILD b/PKGBUILD
index 721d0d8e2532..7a5834b1fd66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,24 @@
# Maintainer: Vianney Bouchaud <aur dot vianney at bouchaud dot org>
pkgname=kured-sentinel
-pkgdesc="Pacman hook to create the sentinel file for kured."
-pkgver=1.0.1
-pkgrel=2
+pkgdesc="Sentinel script for Kured - Kubernetes Reboot Daemon"
+pkgver=2.0.0
+pkgrel=1
arch=("any")
url="https://github.com/vbouchaud/aur/tree/main/kured-sentinel"
license=("MIT")
-depends=("longoverdue")
sha256sums=(
35e3cbe726e28f2f624acbe4fce8af09715e55537df7aa22ac89f00cde399515
- 7adee67c790d12201ff5593e1b471e7fcacb34942a253dc2bc7b4cdb2b1a55bd
- 1a479269137b31a0143bfd53b834fd34549d4aedaac19004e1d8bac19ef66500
+ 066e168bc38d99cce7937098ecbc094eae1a6671733cdfced0c8d76b987da873
)
source=(
LICENSE::https://bouchaud.org/misc/MIT.txt
kured-sentinel
- kured-sentinel.hook
)
package() {
- install -D -m0644 "$srcdir/kured-sentinel.hook" "$pkgdir/usr/share/libalpm/hooks/kured-sentinel.hook"
install -D -m0755 "$srcdir/kured-sentinel" "$pkgdir/usr/bin/kured-sentinel"
install -D -m0644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/kured-sentinel b/kured-sentinel
index 5081827341a1..ae690b37317a 100755
--- a/kured-sentinel
+++ b/kured-sentinel
@@ -1,9 +1,21 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
-explicitly_asked=$(longoverdue | grep -c "reboot required")
-critical_services_updated=$(longoverdue | grep -c "kubelet")
-kernel_updated=$(longoverdue | grep -c "running kernel")
+debug() {
+ if [ -n DEBUG ]; then
+ >&2 echo $*
+ fi
+}
-if (( $(( explicitly_asked + critical_services_updated + kernel_updated )) > 0 )); then
- touch /var/run/reboot-required
+libs=$(lsof -n +c 0 2> /dev/null | grep 'DEL.*lib' | awk '1 { print $1 ": " $NF }' | sort -u)
+if [[ -n $libs ]]; then
+ debug "$libs"
+ debug "libs need reload"
+ exit 0
fi
+
+if [ ! -d "/lib/modules/$(uname -r)" ]; then
+ debug "kernel need reload"
+ exit 0
+fi
+
+exit 1
diff --git a/kured-sentinel.hook b/kured-sentinel.hook
deleted file mode 100644
index 2ef3b5346193..000000000000
--- a/kured-sentinel.hook
+++ /dev/null
@@ -1,10 +0,0 @@
-[Trigger]
-Operation = Upgrade
-Type = File
-Target = usr/*
-
-[Action]
-Description = Adding reboot sentinel file if needed...
-Depends = longoverdue
-When = PostTransaction
-Exec = /usr/bin/kured-sentinel