maggesandClaude Sonnet 5
7f6fcb9166
Root cause of a fresh-install "cannot reach the Podman API socket" report (a friend's Unraid box, cache pool present and mounted): unlike Docker-for-Unraid's docker.img path, this plugin never auto-created STORAGE_PATH itself — only podman.img inside it. A perfectly normal, already-mounted cache pool still failed preflight/storage-create with "does not exist", just because its own .../system/podman subdirectory had never been created. Fixed by walking up to the nearest existing ancestor and checking whether it's on a different device than / (real mount vs. nothing mounted at all) — see podman-common.sh's new podman_path_has_real_mount_ancestor(), used by both podman-preflight.sh and podman-storage.sh. Settings gets a "Podman Service" card (status chip + Start/Restart, backed by new ajax/settings.php service_status/start/restart actions that just shell out to rc.podman) so a fresh install that failed to start can be diagnosed and retried without SSH/terminal access at all — exactly what was missing when this was first needed live. Also adds "Format a Disk for Podman Storage" (new ajax/disks.php) for a single-disk system with no cache pool at all. Only ever lists disks with literally no existing partition/filesystem/RAID-or-ZFS-membership signature and that aren't Unraid's boot flash — found live, twice, during development: the boot USB (FAT, labeled "UNRAID") passed the initial mounted-only check because this host's /boot is backed by a ZFS dataset rather than a direct partition mount, and active RAID-member cache disks passed a data-vs-blank *warning* rather than a hard exclusion. Both are now excluded outright, not just flagged — see disks.php's device_or_children_labeled_unraid() and the hasData exclusion in list_candidate_disks(). A disk formatted this way is remounted by UUID on every boot via a new plugin/sbin/podman-mount-managed-disk.sh, called from plugin/event/disks_mounted before rc.podman start. Unrelated fix bundled in: scripts/lib/slackbuild-common.sh now sets SOURCE_DATE_EPOCH (derived from the repo's last commit) before calling makepkg, so two separate builds of the same commit produce byte-identical .txz files — makepkg already supports this (`--clamp-mtime` when $SOURCE_DATE_EPOCH is set, confirmed by reading a real host's /sbin/makepkg) but nothing was setting the variable, so release.yml's "rebuild in CI and verify it matches the committed checksums" step was guaranteed to fail on the first package it checked alphabetically (observed live: aardvark-dns). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
52 lines
1.9 KiB
Bash
52 lines
1.9 KiB
Bash
#!/bin/bash
|
|
# =============================================================================
|
|
# plugin/sbin/podman-mount-managed-disk.sh
|
|
#
|
|
# Remounts, on every boot, a disk the WebUI's "Format a Disk for Podman
|
|
# Storage" flow (webui/plugins/podman/ajax/disks.php's "format" action)
|
|
# formatted and mounted for a single-disk system with no cache pool —
|
|
# that disk is deliberately outside Unraid's own array/cache pool
|
|
# management (it's just a plain XFS filesystem on an otherwise-unassigned
|
|
# disk), so nothing else on the system would remount it after a reboot.
|
|
#
|
|
# Called from plugin/event/disks_mounted, BEFORE rc.podman start, so
|
|
# $STORAGE_PATH (pointed at this disk's mountpoint via Settings) is a real
|
|
# mounted filesystem by the time podman-storage.sh's `create`/`mount`
|
|
# steps run — see that script's "does not exist or is not mounted" check.
|
|
#
|
|
# Does nothing (exit 0) if the plugin was never used to format a disk —
|
|
# /boot/config/plugins/podman/managed-disk.cfg only exists after that flow
|
|
# has actually run at least once.
|
|
# =============================================================================
|
|
|
|
set -eu
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
# shellcheck source=./podman-common.sh
|
|
. "$SCRIPT_DIR/podman-common.sh"
|
|
|
|
MANAGED_DISK_CFG="$PODMAN_BOOT_DIR/managed-disk.cfg"
|
|
[ -f "$MANAGED_DISK_CFG" ] || exit 0
|
|
|
|
UUID=""
|
|
MOUNTPOINT=""
|
|
# shellcheck source=/dev/null
|
|
. "$MANAGED_DISK_CFG"
|
|
|
|
if [ -z "$UUID" ] || [ -z "$MOUNTPOINT" ]; then
|
|
podman_log_error "mount-managed-disk: $MANAGED_DISK_CFG is missing UUID/MOUNTPOINT, skipping"
|
|
exit 0
|
|
fi
|
|
|
|
if mountpoint -q "$MOUNTPOINT" 2> /dev/null; then
|
|
podman_log "mount-managed-disk: $MOUNTPOINT already mounted"
|
|
exit 0
|
|
fi
|
|
|
|
mkdir -p "$MOUNTPOINT"
|
|
if mount "UUID=$UUID" "$MOUNTPOINT"; then
|
|
podman_log "mount-managed-disk: mounted UUID=$UUID at $MOUNTPOINT"
|
|
else
|
|
podman_log_error "mount-managed-disk: failed to mount UUID=$UUID at $MOUNTPOINT (disk removed/renamed?)"
|
|
fi
|