status: fix false DRIFT for non-root invocations
- runner: export sbin-inclusive PATH (util-linux tools live in /usr/sbin) - 001: read /proc/swaps instead of swapon(8) - 005: resolve /dev/disk/by-uuid symlink instead of findfs(8); report ? (exit 2) when the UUID cannot be resolved
This commit is contained in:
@@ -26,8 +26,7 @@ case "${1:-}" in
|
||||
echo " swap 2GB enabled + fstab entry + vm.swappiness=10"
|
||||
;;
|
||||
status)
|
||||
swapon --show --noheadings 2>/dev/null | grep -q '^/swapfile ' \
|
||||
|| { echo "DRIFT /swapfile not active"; exit 1; }
|
||||
grep -q '^/swapfile ' /proc/swaps || { echo "DRIFT /swapfile not active"; exit 1; }
|
||||
grep -q '^/swapfile ' /etc/fstab || { echo "DRIFT fstab entry missing"; exit 1; }
|
||||
swp=$(cat /proc/sys/vm/swappiness 2>/dev/null || echo '?')
|
||||
[[ $swp == 10 ]] || { echo "DRIFT vm.swappiness=$swp (want 10)"; exit 1; }
|
||||
|
||||
@@ -32,7 +32,8 @@ case "${1:-}" in
|
||||
;;
|
||||
status)
|
||||
src=$(findmnt -rn -o SOURCE "$MOUNTPOINT" 2>/dev/null || true)
|
||||
want=$(findfs UUID="$DISK_UUID" 2>/dev/null || true)
|
||||
want=$(readlink -f "/dev/disk/by-uuid/$DISK_UUID" 2>/dev/null || true)
|
||||
[[ -n $want ]] || { echo "? cannot resolve UUID=$DISK_UUID"; exit 2; }
|
||||
[[ -n $src ]] || { echo "DRIFT $MOUNTPOINT not mounted"; exit 1; }
|
||||
[[ $src == "$want" ]] || { echo "DRIFT $MOUNTPOINT mounted from $src (want $want)"; exit 1; }
|
||||
grep -q "^UUID=$DISK_UUID $MOUNTPOINT " /etc/fstab \
|
||||
|
||||
Reference in New Issue
Block a user