boneio 1.6.0.dev16__tar.gz → 1.6.0.dev17__tar.gz

{boneio-1.6.0.dev16/boneio.egg-info → boneio-1.6.0.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boneio
-Version: 1.6.0.dev16
+Version: 1.6.0.dev17
 Summary: Python App for BoneIO
 Author-email: Paweł Szafer <pszafer@gmail.com>
 License: GNU General Public License v3.0

{boneio-1.6.0.dev16 → boneio-1.6.0.dev17}/boneio/core/manager/display.py

@@ -316,8 +316,8 @@ class DisplayManager:
             self._oled._sleep_timeout = TimePeriod(seconds=int(timeout_seconds))
 
             # Reset to first screen and refresh
-            if self._configured_screen_order:
-                self._oled._current_screen = self._configured_screen_order[0]
+            # The notice, if one stands, stays first.
+            self._oled._current_screen = self._oled.first_screen()
             self._oled.render_display()
 
             _LOGGER.info(

{boneio-1.6.0.dev16 → boneio-1.6.0.dev17}/boneio/hardware/display/oled.py

@@ -5,6 +5,8 @@ import contextlib
 import logging
 import subprocess
 import threading
+from collections.abc import Callable
+from datetime import timedelta
 from itertools import cycle
 from typing import TYPE_CHECKING
 
@@ -144,6 +146,15 @@ except OSError:
 
 # Screen layout constants
 START_ROW = 17
+
+#: Pseudo-screen for a notice that needs somebody at the device, such as the
+#: first administrator not created yet. Never part of ``oled.screens``.
+NOTICE = "notice"
+#: How often the condition behind a notice is checked again.
+NOTICE_RECHECK_S = 5.0
+#: Idle time after which a display showing a normal screen goes back to the
+#: notice, in place of going to sleep.
+NOTICE_RETURN_S = 60.0
 UPTIME_ROWS = list(range(22, 60, 10))
 OUTPUT_ROWS = list(range(14, 60, 6))
 INPUT_ROWS = list(range(12, 60, 6))
@@ -158,6 +169,35 @@ def shorten_name(name: str) -> str:
     return name
 
 
+def _split_to_width(draw: ImageDrawType, line: str, font, width: int) -> list[str]:
+    """Break a line too wide for the panel, after a ``.``, ``:`` or ``/``.
+
+    For addresses: a cloud name with its port is wider than 128 px at 7 pt,
+    and cut at the edge it loses the port, which is the part nobody can guess.
+
+    Args:
+        draw: Canvas the line is drawn on, for measuring.
+        line: The text.
+        font: Font it is drawn in.
+        width: Pixels available.
+
+    Returns:
+        The line, or its pieces.
+    """
+    out: list[str] = []
+    while line and draw.textlength(line, font=font) > width:
+        cut = max(
+            (i + 1 for i, ch in enumerate(line) if ch in ".:/" and draw.textlength(line[: i + 1], font=font) <= width),
+            default=0,
+        )
+        if cut == 0:
+            break
+        out.append(line[:cut])
+        line = line[cut:]
+    out.append(line)
+    return out
+
+
 class Oled:
     """OLED Display driver for SH1106 I2C display."""
 
@@ -201,6 +241,12 @@ class Oled:
         self._cancel_sleep_handle = None
         self._sleep_timeout = sleep_timeout
 
+        # A notice shown ahead of the configured screens; see show_notice().
+        self._notice: tuple[str, list[str]] | None = None
+        self._notice_needed: Callable[[], bool] | None = None
+        self._notice_lines_fn: Callable[[], list[str]] | None = None
+        self._notice_check_handle: asyncio.TimerHandle | None = None
+
         # Shutdown confirmation state machine
         # States: None -> "wait_release" -> "confirm" -> "progress" -> shutdown
         # - Long press held 2s+ → show confirm screen, enter "wait_release"
@@ -598,9 +644,137 @@ class Oled:
             _LOGGER.error("Error shutting down device: %s", e)
             self.render_display()
 
+    # --- Notice ---
+
+    def show_notice(
+        self, title: str, lines: Callable[[], list[str]], still_needed: Callable[[], bool]
+    ) -> None:
+        """Put a notice first on the display and keep the display awake for it.
+
+        For a state nobody can fix without walking up to a browser — a device
+        with no administrator yet refuses its API, and a headless controller
+        has no other way of saying so. While the notice stands the display
+        does not sleep: the button still leafs through the configured screens,
+        and after a minute without a press the display comes back to the
+        notice. ``still_needed`` is asked every few seconds, so the notice
+        goes by itself however the state was fixed — the wizard, the accounts
+        CLI, a restored backup.
+
+        Args:
+            title: Short title, in the big font.
+            lines: Returns the lines below it; asked again at every check, so
+                an address that was not known at boot (DHCP still running)
+                appears once it is.
+            still_needed: Returns False once the notice can go.
+        """
+        self._notice = (title, self._notice_lines(lines))
+        self._notice_lines_fn = lines
+        self._notice_needed = still_needed
+        self._sleep = False
+        self._show(NOTICE)
+        self._schedule_notice_check()
+
+    def clear_notice(self) -> None:
+        """Take the notice down and go back to the configured screens."""
+        if self._notice_check_handle is not None:
+            self._notice_check_handle.cancel()
+            self._notice_check_handle = None
+        if self._notice is None:
+            return
+        self._notice = None
+        self._notice_needed = None
+        self._notice_lines_fn = None
+        if self._current_screen == NOTICE:
+            self._show(self.first_screen())
+
+    @property
+    def notice(self) -> tuple[str, list[str]] | None:
+        """The notice being shown, as (title, lines), or None."""
+        return self._notice
+
+    def first_screen(self) -> str:
+        """The screen the display starts on: the notice, if there is one."""
+        if self._notice is not None:
+            return NOTICE
+        return self._screen_order[0] if self._screen_order else UPTIME
+
+    def _show(self, screen: str) -> None:
+        with contextlib.suppress(KeyError):
+            self._event_bus.remove_event_listener(listener_id=f"oled_{self._current_screen}")
+        self._current_screen = screen
+        self.render_display()
+
+    def _schedule_notice_check(self) -> None:
+        if self._notice_check_handle is not None:
+            self._notice_check_handle.cancel()
+        try:
+            loop = asyncio.get_running_loop()
+        except RuntimeError:
+            self._notice_check_handle = None
+            return
+        self._notice_check_handle = loop.call_later(NOTICE_RECHECK_S, self._check_notice)
+
+    def _check_notice(self) -> None:
+        self._notice_check_handle = None
+        if self._notice is None or self._notice_needed is None:
+            return
+        try:
+            needed = self._notice_needed()
+        except Exception as err:  # noqa: BLE001 - keep the notice, say why
+            _LOGGER.debug("Could not check the OLED notice: %s", err)
+            needed = True
+        if needed:
+            if self._notice_lines_fn is not None:
+                lines = self._notice_lines(self._notice_lines_fn)
+                if lines != self._notice[1]:
+                    self._notice = (self._notice[0], lines)
+                    if self._current_screen == NOTICE and not self._sleep:
+                        self._draw_notice()
+            self._schedule_notice_check()
+        else:
+            _LOGGER.info("OLED notice no longer needed, back to the configured screens")
+            self.clear_notice()
+
+    @staticmethod
+    def _notice_lines(lines: Callable[[], list[str]]) -> list[str]:
+        try:
+            return list(lines())
+        except Exception as err:  # noqa: BLE001 - a notice without lines still says enough
+            _LOGGER.debug("Could not build the OLED notice lines: %s", err)
+            return []
+
+    def _draw_notice(self) -> None:
+        """Title where every screen has it, then up to four lines.
+
+        No warning sign as on the recovery notice: its row is needed, since a
+        cloud address with its port takes two lines.
+        """
+        if self._notice is None:
+            return
+        title, lines = self._notice
+        with canvas(self._device) as draw:
+            draw.text((1, 1), title, font=fonts["big"], fill=WHITE)
+            y = START_ROW
+            wrapped: list[str] = []
+            for line in lines:
+                wrapped.extend(_split_to_width(draw, line, fonts["extraSmall"], 124))
+            for line in wrapped[:4]:
+                draw.text((3, y), line, font=fonts["extraSmall"], fill=WHITE)
+                y += 11
+
     def render_display(self) -> None:
         """Render display - main method that decides what to display."""
 
+        if self._current_screen == NOTICE:
+            if self._notice is not None:
+                self._draw_notice()
+                # Awake for as long as it is shown.
+                if self._cancel_sleep_handle:
+                    self._cancel_sleep_handle()
+                    self._cancel_sleep_handle = None
+                return
+            self._current_screen = self.first_screen()
+
         data = self._host_data.get(self._current_screen)
         if data:
             if self._current_screen == "web":
@@ -643,13 +817,16 @@ class Oled:
                         )
         else:
             self._next_screen()
+            return
 
-        if self._sleep_timeout.total_seconds > 0:
+        if self._notice is not None:
+            self.start_sleep_timer(NOTICE_RETURN_S)
+        elif self._sleep_timeout.total_seconds > 0:
             self.start_sleep_timer()
 
     def _update_display(self) -> None:
         """Update OLED display without re-registering listeners."""
-        if self._sleep:
+        if self._sleep or self._current_screen == NOTICE:
             return
 
         try:
@@ -735,19 +912,31 @@ class Oled:
                 )
                 row_no += 15
 
-    def start_sleep_timer(self) -> None:
-        """Start sleep timer."""
+    def start_sleep_timer(self, seconds: float | None = None) -> None:
+        """Start sleep timer.
+
+        Args:
+            seconds: Idle time instead of the configured screensaver timeout.
+        """
         if self._cancel_sleep_handle:
             self._cancel_sleep_handle()
 
+        delay = (
+            timedelta(seconds=seconds) if seconds is not None else self._sleep_timeout.as_timedelta
+        )
         self._cancel_sleep_handle = async_track_point_in_time(
             loop=asyncio.get_running_loop(),
             job=self._sleep_callback,
-            point_in_time=utcnow() + self._sleep_timeout.as_timedelta,
+            point_in_time=utcnow() + delay,
         )
 
     async def _sleep_callback(self, timestamp) -> None:
         """Sleep callback."""
+        if self._notice is not None:
+            # Not while a notice stands: back to it instead.
+            self._cancel_sleep_handle = None
+            self._show(NOTICE)
+            return
         self._sleep = True
         self._cancel_sleep_handle = None
         with canvas(self._device) as draw:
@@ -770,6 +959,9 @@ class Oled:
         """Shutdown OLED display."""
         if self._cancel_sleep_handle:
             self._cancel_sleep_handle()
+        if self._notice_check_handle is not None:
+            self._notice_check_handle.cancel()
+            self._notice_check_handle = None
         # Clear display
         try:
             with canvas(self._device) as draw:

{boneio-1.6.0.dev16 → boneio-1.6.0.dev17}/boneio/migrations/actions.py

@@ -529,3 +529,28 @@ class RemoveFromGroup(MigrationAction):
             "account": self.account,
             "group": self.group,
         }
+
+
+@dataclass
+class FstabAddOptions(MigrationAction):
+    """Add mount options to the ``/etc/fstab`` entries of one mount point.
+
+    fstab is per device — the MMC it boots from, whether it has swap — so it
+    cannot be installed whole. The helper edits only the options field of the
+    matching lines, and only with options it lists for that mount point.
+
+    Args:
+        mountpoint: The mount point whose entries to change.
+        options: Options to add where they are missing.
+    """
+
+    mountpoint: str
+    options: list[str] = field(default_factory=list)
+
+    def to_dict(self) -> dict[str, Any]:
+        """Serialize to dict."""
+        return {
+            "action": "fstab_add_options",
+            "mountpoint": self.mountpoint,
+            "options": list(self.options),
+        }

{boneio-1.6.0.dev16 → boneio-1.6.0.dev17}/boneio/migrations/assets/MANIFEST.sha256

@@ -12,7 +12,7 @@ f2ed05c6f5934a15f12571139bdc225804f67b8c83561cc39868f7b2296d2697  docker/daemon.
 bff00753c72fb17609a6f7b3a58ef78b7b394da12d19fd65b875f2889695e2b4  docker/nodered/node-red/settings.js
 3f41bcf2311bef4042f8082b7ae769fe298f05f46739e47f14e661a3c47733b0  helpers/boneio-containers
 dff0cd02daad2cbd525a0535f8f3562bb742e7e737b24c69e5afa986415e67e4  helpers/boneio-helpers-heal
-f71eedd872946f28e6dda2a1ea579af2f7072d2cf7a53a6eb88d20e02789b06d  helpers/boneio-migrate-v2
+7615397aa52a3cb34cda4b3831d1306121844e2cc0403c114e95d8731075dd3b  helpers/boneio-migrate-v2
 bf2f72174edb3ccc7edef69b29792ad3885879c249ba6c50e1ec22d7bbca85b6  helpers/boneio-system
 f316c778b3125e4e992942c889c4082f8a12f578a6d68c4e7c79fa80e4cc94a1  issue.d/10-boneio.issue
 e6013f4fbf11693f39123b1e6159c7d7224a7c832e994722120980f64039c17e  journald/journald.conf

{boneio-1.6.0.dev16 → boneio-1.6.0.dev17}/boneio/migrations/assets/helpers/boneio-migrate-v2

@@ -133,6 +133,7 @@ ALLOWED_ACTIONS = {
     "prune_orphaned_journal_dirs",
     "set_file_permissions",
     "remove_from_group",
+    "fstab_add_options",
 }
 
 #: The closed set of validators. v1 took a command string and ran it, so the
@@ -161,6 +162,23 @@ REMOVABLE_MEMBERSHIPS = {("boneio", "docker")}
 #: actually installed and root-owned rather than trusting the plan's ordering.
 CONTAINERS_HELPER = Path("/usr/sbin/boneio-containers")
 
+FSTAB = Path("/etc/fstab")
+
+#: Mount options a plan may add, per mount point. Not a general fstab editor:
+#: mount options decide whether a filesystem allows setuid binaries and
+#: device nodes, and whether the root filesystem is writable at all, so
+#: "set these options on that mount" is too wide a verb for a plan that can
+#: see neither the device's fstab nor what else is mounted there. ``nofail``
+#: can only ever make a mount less able to stop the boot.
+FSTAB_ADDABLE_OPTIONS = {"/boot/firmware": frozenset({"nofail"})}
+
+#: One fstab entry: source, mount point, type, options, and whatever follows
+#: (dump and pass), with the whitespace between them kept as it was.
+_FSTAB_ENTRY_RE = re.compile(
+    r"^(?P<head>\s*\S+\s+)(?P<target>\S+)(?P<mid>\s+\S+)"
+    r"(?:(?P<sep>\s+)(?P<options>\S+))?(?P<tail>.*)$"
+)
+
 RECOVERY_ALLOWED_ACTIONS = {"install_file", "remove_file"}
 RECOVERY_ALLOWED_PATHS = {str(RELEASE_ANCHOR), str(RECOVERY_ANCHOR)}
 
@@ -1358,6 +1376,94 @@ def handle_remove_from_group(action: dict[str, Any], assets_base: str) -> None:
     _LOGGER.info("GROUP: removed %s from %s", account, group)
 
 
+def handle_fstab_add_options(action: dict[str, Any], assets_base: str) -> None:
+    """Add mount options to the fstab entries of one mount point.
+
+    Only the options field of the matching lines changes; comments, spacing
+    and every other entry are written back byte for byte. fstab differs per
+    device — which MMC it boots from, whether it has a swap line — so the file
+    cannot be shipped whole the way ``install_file`` would. A device without
+    the entry, or with the options already there, is reported and skipped.
+
+    The file is replaced atomically and flushed before and after the rename:
+    this edits the one file that decides whether the next boot finds its
+    filesystems, and the reason for editing it is power loss.
+
+    Args:
+        action: Action dict with mountpoint and options.
+        assets_base: Unused.
+
+    Raises:
+        Refused: If the mount point or an option is not in
+            :data:`FSTAB_ADDABLE_OPTIONS`.
+    """
+    mountpoint = str(action.get("mountpoint", ""))
+    options = [str(option) for option in action.get("options", [])]
+    allowed = FSTAB_ADDABLE_OPTIONS.get(mountpoint)
+    if allowed is None or not options or not set(options) <= allowed:
+        raise Refused(
+            f"refusing to add {options!r} to the fstab entry for {mountpoint!r}: "
+            "not an option this helper may add there"
+        )
+
+    if not FSTAB.is_file():
+        _LOGGER.info("SKIP (no fstab): %s", FSTAB)
+        return
+
+    original = FSTAB.read_text(encoding="utf-8")
+    lines = original.splitlines(keepends=True)
+    found = False
+    for index, line in enumerate(lines):
+        body = line.rstrip("\r\n")
+        if not body.strip() or body.lstrip().startswith("#"):
+            continue
+        match = _FSTAB_ENTRY_RE.match(body)
+        if match is None or match["target"] != mountpoint:
+            continue
+        found = True
+        current = match["options"].split(",") if match["options"] else ["defaults"]
+        missing = [option for option in options if option not in current]
+        if not missing:
+            continue
+        merged = ",".join(current + missing)
+        sep = match["sep"] or "\t"
+        lines[index] = (
+            f"{match['head']}{match['target']}{match['mid']}"
+            f"{sep}{merged}{match['tail']}{line[len(body):]}"
+        )
+
+    if not found:
+        _LOGGER.info("SKIP (no fstab entry): %s", mountpoint)
+        return
+    updated = "".join(lines)
+    if updated == original:
+        _LOGGER.info("SKIP (options present): %s on %s", ",".join(options), mountpoint)
+        return
+
+    st = FSTAB.stat()
+    fd, tmp_path = tempfile.mkstemp(dir=FSTAB.parent, prefix=".fstab.", suffix=".tmp")
+    try:
+        with os.fdopen(fd, "w", encoding="utf-8") as handle:
+            handle.write(updated)
+            handle.flush()
+            os.fsync(handle.fileno())
+        os.chmod(tmp_path, st.st_mode & 0o7777)
+        os.chown(tmp_path, st.st_uid, st.st_gid)
+        os.replace(tmp_path, FSTAB)
+    except Exception:
+        try:
+            os.unlink(tmp_path)
+        except OSError:
+            pass
+        raise
+    dir_fd = os.open(FSTAB.parent, os.O_RDONLY)
+    try:
+        os.fsync(dir_fd)
+    finally:
+        os.close(dir_fd)
+    _LOGGER.info("FSTAB: %s gets %s", mountpoint, ",".join(options))
+
+
 ACTION_HANDLERS = {
     "install_file": handle_install_file,
     "remove_file": handle_remove_file,
@@ -1375,6 +1481,7 @@ ACTION_HANDLERS = {
     "prune_orphaned_journal_dirs": handle_prune_orphaned_journal_dirs,
     "set_file_permissions": handle_set_file_permissions,
     "remove_from_group": handle_remove_from_group,
+    "fstab_add_options": handle_fstab_add_options,
 }
 
 

boneio-1.6.0.dev17/boneio/migrations/plans/1.6.16.json

@@ -0,0 +1 @@
+[{"action":"install_file","dst":"/usr/lib/boneio/trusted/boneio-migrate-v2","expected_sha256":"7615397aa52a3cb34cda4b3831d1306121844e2cc0403c114e95d8731075dd3b","group":"root","mode":493,"owner":"root","src":"helpers/boneio-migrate-v2","template_vars":{},"validate":"python"},{"action":"install_file","dst":"/usr/sbin/boneio-migrate-v2","expected_sha256":"7615397aa52a3cb34cda4b3831d1306121844e2cc0403c114e95d8731075dd3b","group":"root","mode":493,"owner":"root","src":"helpers/boneio-migrate-v2","template_vars":{},"validate":"python"}]

boneio-1.6.0.dev17/boneio/migrations/plans/1.6.16.sig

@@ -0,0 +1 @@
+7

boneio-1.6.0.dev17/boneio/migrations/plans/1.6.19.json

@@ -0,0 +1 @@
+[{"action":"install_file","dst":"/usr/lib/boneio/trusted/boneio-migrate-v2","expected_sha256":"7615397aa52a3cb34cda4b3831d1306121844e2cc0403c114e95d8731075dd3b","group":"root","mode":493,"owner":"root","src":"helpers/boneio-migrate-v2","template_vars":{},"validate":"python"},{"action":"install_file","dst":"/usr/sbin/boneio-migrate-v2","expected_sha256":"7615397aa52a3cb34cda4b3831d1306121844e2cc0403c114e95d8731075dd3b","group":"root","mode":493,"owner":"root","src":"helpers/boneio-migrate-v2","template_vars":{},"validate":"python"}]

boneio-1.6.0.dev17/boneio/migrations/plans/1.6.19.sig

@@ -0,0 +1 @@
+7

boneio-1.6.0.dev17/boneio/migrations/plans/1.6.23.json

@@ -0,0 +1 @@
+[{"action":"install_file","dst":"/usr/lib/boneio/trusted/boneio-migrate-v2","expected_sha256":"7615397aa52a3cb34cda4b3831d1306121844e2cc0403c114e95d8731075dd3b","group":"root","mode":493,"owner":"root","src":"helpers/boneio-migrate-v2","template_vars":{},"validate":"python"},{"action":"install_file","dst":"/usr/sbin/boneio-migrate-v2","expected_sha256":"7615397aa52a3cb34cda4b3831d1306121844e2cc0403c114e95d8731075dd3b","group":"root","mode":493,"owner":"root","src":"helpers/boneio-migrate-v2","template_vars":{},"validate":"python"}]

boneio-1.6.0.dev17/boneio/migrations/plans/1.6.23.sig

@@ -0,0 +1 @@
+7

boneio-1.6.0.dev17/boneio/migrations/plans/1.6.24.json

@@ -0,0 +1 @@
+[{"action":"fstab_add_options","mountpoint":"/boot/firmware","options":["nofail"]},{"action":"systemctl_daemon_reload"}]

boneio-1.6.0.dev17/boneio/migrations/plans/1.6.24.sig

@@ -0,0 +1 @@
+�Z�E��erC�t|�a�l�F)0㷃��8��@�Z�eT�M�x��Y}�Y5���t�d_�

{boneio-1.6.0.dev16 → boneio-1.6.0.dev17}/boneio/migrations/plans/1.6.5.json

@@ -1 +1 @@
-[{"action":"install_file","dst":"/usr/lib/boneio/trusted/boneio-migrate-v2","expected_sha256":"f71eedd872946f28e6dda2a1ea579af2f7072d2cf7a53a6eb88d20e02789b06d","group":"root","mode":493,"owner":"root","src":"helpers/boneio-migrate-v2","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/boneio-containers","expected_sha256":"3f41bcf2311bef4042f8082b7ae769fe298f05f46739e47f14e661a3c47733b0","group":"root","mode":493,"owner":"root","src":"helpers/boneio-containers","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/boneio-system","expected_sha256":"bf2f72174edb3ccc7edef69b29792ad3885879c249ba6c50e1ec22d7bbca85b6","group":"root","mode":493,"owner":"root","src":"helpers/boneio-system","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/boneio-helpers-heal","expected_sha256":"dff0cd02daad2cbd525a0535f8f3562bb742e7e737b24c69e5afa986415e67e4","group":"root","mode":493,"owner":"root","src":"helpers/boneio-helpers-heal","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/sudoers-boneio-helpers","expected_sha256":"74e8c1209b80519dc6e3db6c6d8e7ca02f01f8f618cee6f741e8400270d3b05a","group":"root","mode":288,"owner":"root","src":"sudoers/boneio-helpers","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/migrations.pem","expected_sha256":"16a97c875edb68e19655b953b4baa773cc1a4e57810543cda646a3e3e83c0c0e","group":"root","mode":292,"owner":"root","src":"migrations.pem","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/migrations-recovery.pem","expected_sha256":"9681710e1a38b8ea7ba5558839e4ef8b5f01a75722dbf403913bad76437449ec","group":"root","mode":292,"owner":"root","src":"migrations-recovery.pem","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/docker-compose.yaml","expected_sha256":"48ad7a194a78d3d1b018349b60834389841f56e287068988a75197cfaf9a62c2","group":"root","mode":420,"owner":"root","src":"docker/nodered/docker-compose.yaml","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/docker-compose-cloud.yaml","expected_sha256":"66cc2d02710ac8d0311514b686518afa6d5a0bcbf0c8c069367e1db7157dadd7","group":"root","mode":420,"owner":"root","src":"docker/nodered/docker-compose-cloud.yaml","template_vars":{}},{"action":"install_file","dst":"/etc/boneio/migrations.pem","expected_sha256":"16a97c875edb68e19655b953b4baa773cc1a4e57810543cda646a3e3e83c0c0e","group":"root","mode":292,"owner":"root","src":"migrations.pem","template_vars":{}},{"action":"install_file","dst":"/etc/boneio/migrations-recovery.pem","expected_sha256":"9681710e1a38b8ea7ba5558839e4ef8b5f01a75722dbf403913bad76437449ec","group":"root","mode":292,"owner":"root","src":"migrations-recovery.pem","template_vars":{}},{"action":"install_file","dst":"/usr/sbin/boneio-migrate-v2","expected_sha256":"f71eedd872946f28e6dda2a1ea579af2f7072d2cf7a53a6eb88d20e02789b06d","group":"root","mode":493,"owner":"root","src":"helpers/boneio-migrate-v2","template_vars":{},"validate":"python","validate_cmd":"python3 -m py_compile"},{"action":"install_file","dst":"/usr/sbin/boneio-containers","expected_sha256":"3f41bcf2311bef4042f8082b7ae769fe298f05f46739e47f14e661a3c47733b0","group":"root","mode":493,"owner":"root","src":"helpers/boneio-containers","template_vars":{},"validate":"python","validate_cmd":"python3 -m py_compile"},{"action":"install_file","dst":"/usr/sbin/boneio-helpers-heal","expected_sha256":"dff0cd02daad2cbd525a0535f8f3562bb742e7e737b24c69e5afa986415e67e4","group":"root","mode":493,"owner":"root","src":"helpers/boneio-helpers-heal","template_vars":{},"validate":"python","validate_cmd":"python3 -m py_compile"},{"action":"install_file","dst":"/etc/sudoers.d/boneio-helpers","expected_sha256":"74e8c1209b80519dc6e3db6c6d8e7ca02f01f8f618cee6f741e8400270d3b05a","group":"root","mode":288,"owner":"root","src":"sudoers/boneio-helpers","template_vars":{},"validate":"sudoers","validate_cmd":"visudo -cf"},{"action":"install_file","dst":"/etc/systemd/system/boneio-helpers-heal.service","expected_sha256":"d3feacddc720307c6ce739e21cb5ca79d90b05c7e1a1f3d9481cd9dbb071c2c6","group":"root","mode":420,"on_change":{"action":"systemctl_daemon_reload"},"owner":"root","src":"systemd/boneio-helpers-heal.service","template_vars":{}},{"action":"systemctl_enable","unit":"boneio-helpers-heal.service"},{"action":"set_file_permissions","group":"root","mode":420,"owner":"root","path":"/home/boneio/docker/nodered/docker-compose.yaml"}]
+[{"action":"install_file","dst":"/usr/lib/boneio/trusted/boneio-migrate-v2","expected_sha256":"7615397aa52a3cb34cda4b3831d1306121844e2cc0403c114e95d8731075dd3b","group":"root","mode":493,"owner":"root","src":"helpers/boneio-migrate-v2","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/boneio-containers","expected_sha256":"3f41bcf2311bef4042f8082b7ae769fe298f05f46739e47f14e661a3c47733b0","group":"root","mode":493,"owner":"root","src":"helpers/boneio-containers","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/boneio-system","expected_sha256":"bf2f72174edb3ccc7edef69b29792ad3885879c249ba6c50e1ec22d7bbca85b6","group":"root","mode":493,"owner":"root","src":"helpers/boneio-system","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/boneio-helpers-heal","expected_sha256":"dff0cd02daad2cbd525a0535f8f3562bb742e7e737b24c69e5afa986415e67e4","group":"root","mode":493,"owner":"root","src":"helpers/boneio-helpers-heal","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/sudoers-boneio-helpers","expected_sha256":"74e8c1209b80519dc6e3db6c6d8e7ca02f01f8f618cee6f741e8400270d3b05a","group":"root","mode":288,"owner":"root","src":"sudoers/boneio-helpers","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/migrations.pem","expected_sha256":"16a97c875edb68e19655b953b4baa773cc1a4e57810543cda646a3e3e83c0c0e","group":"root","mode":292,"owner":"root","src":"migrations.pem","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/migrations-recovery.pem","expected_sha256":"9681710e1a38b8ea7ba5558839e4ef8b5f01a75722dbf403913bad76437449ec","group":"root","mode":292,"owner":"root","src":"migrations-recovery.pem","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/docker-compose.yaml","expected_sha256":"48ad7a194a78d3d1b018349b60834389841f56e287068988a75197cfaf9a62c2","group":"root","mode":420,"owner":"root","src":"docker/nodered/docker-compose.yaml","template_vars":{}},{"action":"install_file","dst":"/usr/lib/boneio/trusted/docker-compose-cloud.yaml","expected_sha256":"66cc2d02710ac8d0311514b686518afa6d5a0bcbf0c8c069367e1db7157dadd7","group":"root","mode":420,"owner":"root","src":"docker/nodered/docker-compose-cloud.yaml","template_vars":{}},{"action":"install_file","dst":"/etc/boneio/migrations.pem","expected_sha256":"16a97c875edb68e19655b953b4baa773cc1a4e57810543cda646a3e3e83c0c0e","group":"root","mode":292,"owner":"root","src":"migrations.pem","template_vars":{}},{"action":"install_file","dst":"/etc/boneio/migrations-recovery.pem","expected_sha256":"9681710e1a38b8ea7ba5558839e4ef8b5f01a75722dbf403913bad76437449ec","group":"root","mode":292,"owner":"root","src":"migrations-recovery.pem","template_vars":{}},{"action":"install_file","dst":"/usr/sbin/boneio-migrate-v2","expected_sha256":"7615397aa52a3cb34cda4b3831d1306121844e2cc0403c114e95d8731075dd3b","group":"root","mode":493,"owner":"root","src":"helpers/boneio-migrate-v2","template_vars":{},"validate":"python","validate_cmd":"python3 -m py_compile"},{"action":"install_file","dst":"/usr/sbin/boneio-containers","expected_sha256":"3f41bcf2311bef4042f8082b7ae769fe298f05f46739e47f14e661a3c47733b0","group":"root","mode":493,"owner":"root","src":"helpers/boneio-containers","template_vars":{},"validate":"python","validate_cmd":"python3 -m py_compile"},{"action":"install_file","dst":"/usr/sbin/boneio-helpers-heal","expected_sha256":"dff0cd02daad2cbd525a0535f8f3562bb742e7e737b24c69e5afa986415e67e4","group":"root","mode":493,"owner":"root","src":"helpers/boneio-helpers-heal","template_vars":{},"validate":"python","validate_cmd":"python3 -m py_compile"},{"action":"install_file","dst":"/etc/sudoers.d/boneio-helpers","expected_sha256":"74e8c1209b80519dc6e3db6c6d8e7ca02f01f8f618cee6f741e8400270d3b05a","group":"root","mode":288,"owner":"root","src":"sudoers/boneio-helpers","template_vars":{},"validate":"sudoers","validate_cmd":"visudo -cf"},{"action":"install_file","dst":"/etc/systemd/system/boneio-helpers-heal.service","expected_sha256":"d3feacddc720307c6ce739e21cb5ca79d90b05c7e1a1f3d9481cd9dbb071c2c6","group":"root","mode":420,"on_change":{"action":"systemctl_daemon_reload"},"owner":"root","src":"systemd/boneio-helpers-heal.service","template_vars":{}},{"action":"systemctl_enable","unit":"boneio-helpers-heal.service"},{"action":"set_file_permissions","group":"root","mode":420,"owner":"root","path":"/home/boneio/docker/nodered/docker-compose.yaml"}]

boneio-1.6.0.dev17/boneio/migrations/plans/1.6.5.sig

@@ -0,0 +1 @@
+��tS�a�٪�ǟ(zZ֯���`�8��7&'�U �L��˾�*u����D�J#j����G�S/�E�0	

{boneio-1.6.0.dev16 → boneio-1.6.0.dev17}/boneio/migrations/plans/manifest.json

@@ -1 +1 @@
-{"plans":{"1.3.0":"645ac6bdda8dc0a73c219aa3684a29df4bdd4032aad97a833b259de489b2ce32","1.3.1":"580381a4f6f40fc1bd4e903e591ad0d5c1db27daaccafc6f79dabf8c3b84259a","1.3.2":"7a69ffaf0c41438be25a656dcdc87783daac0eae79218d023648ef9d708e373f","1.4.0":"41c3a16e7819857a4b826e944fcfb4f79c58e7192cb151b106a3acd7487d5771","1.4.3":"a8cfbabff09d21944a822c4a70f23a7ee14960c4054de151c9fbc7cdb29adff5","1.4.4":"19508f66d84f1e16bd24932aaa17d45417912ffd1c20d326b2f003b931ac2f8c","1.5.0":"52d9d118da099abda0e0153cd16892e201681f6e4d3c6e5790284d1ac469a407","1.5.1":"d283cb8c01024338fb614ae2199744d883379f59579423e4eb9234f5c59ebdd8","1.5.10":"889e2f12614e6e67d342571c1c3bab8940659bfbbf43fa30a6847e73decb85d1","1.5.11":"4906e4de2b3a9c2f0b0181817c9dc168cb910ba6941691d4e86b8387802b624a","1.5.12":"c0a0dc085bb33d9718e869ed5effc2c1581deffd7ed0d5adc119b94312181625","1.5.13":"bfe58c8756f9b5f5e55d5acbb6f7cfc469d201004d312c14e022eb7c52369b7d","1.5.14":"a0464f11e05128cba8881e6295e591fce1ed1e8d43ab0e16710effb8e543d810","1.5.15":"0687a735cb4aaf8f8f74ad6e228ca1b14e045cba8821991c7d19fc9beaeac766","1.5.16":"3544ac754f39d56ecf2b06300b7cca1b6f8723f99885cd11bd690f1a704d3728","1.5.17":"cf1e9e0ff6812cb7092a82dd588392d625decbe3680fe003dfc554f9045809d3","1.5.18":"1fd873effa66b632217d674745722f712a48b36bb79957fefae722757a74bc30","1.5.2":"39fccb7582e13e7e3436861fde7b83ddb8057788cbde792f2f0cf7003f068850","1.5.3":"39fccb7582e13e7e3436861fde7b83ddb8057788cbde792f2f0cf7003f068850","1.5.4":"e86174ba5aff6f257f8a3f4721c7942885cd203469a9d8ddc15dbe6c704e0f45","1.5.5":"f93ed2d4342e447eb9900a0150331113918f2a8b3baeeb795c07231d80f0337c","1.5.6":"e3d90e6ceb20d760f1e9fa63224c5a070a16b3ca6e7dc4cc2c594138e929cce8","1.5.7":"a0464f11e05128cba8881e6295e591fce1ed1e8d43ab0e16710effb8e543d810","1.5.8":"f075b84fb04f4043658a28402d963494dd58481f164c0b371cec94322fe6d131","1.5.9":"ac170fc924019fc2acd69a90a82ba5c2552dce7a2c01a05e5407443e7a9e5af7","1.6.0":"c8286514d1a4f1805e727e13d3c350bb390378c6f31ad6920030412d61ec9b3f","1.6.1":"aa1d3934091853fc21208993930c1bf92e17136428d1d0baaefabfa65d13e7fa","1.6.10":"41c3a16e7819857a4b826e944fcfb4f79c58e7192cb151b106a3acd7487d5771","1.6.11":"d136203e08e3b052254403815d4ccedb555b0a297686fe97952d275eb1f322eb","1.6.12":"c328d4e36bd6277e01cef0140993e23970f4dff84425f3eba236cdd9a8954355","1.6.13":"f1f8b091d054a08665f047b5ad91f1f309f729a8aa30a2992d6ffdbd7f9fa7e4","1.6.14":"f1f8b091d054a08665f047b5ad91f1f309f729a8aa30a2992d6ffdbd7f9fa7e4","1.6.15":"8cfaeae24ceefe171d40241549c1f62527ce41821e5fd2904c0df1973596c0c7","1.6.16":"ac92616305848b63d942f9c14938ddd1032fc763ace933e9078ad3ef9f750be2","1.6.17":"d0197d4a4139f4801cbcfcfe8737ef98121270f6b7f1759ff4ab19ae2ccea9e1","1.6.18":"d0197d4a4139f4801cbcfcfe8737ef98121270f6b7f1759ff4ab19ae2ccea9e1","1.6.19":"ac92616305848b63d942f9c14938ddd1032fc763ace933e9078ad3ef9f750be2","1.6.2":"6ef96b5e00a04a929d16f0e4a136bfcc5b8132a466d6907a99b2c8516a8952d5","1.6.20":"28027c836eef19b21b95500760961e181f6078d22cccf8cca62b77bbbb11a0c5","1.6.21":"b0d0777e81edc8532d42bcd3b6d518fecd6078153dfe9f5f859469d2c13b369d","1.6.22":"cd5c9ac1e72631484891b96073a1c850d683b4763f65779ac5b349bfa0b79c9c","1.6.3":"5c10db827bcb92b9322d4aa5751076b825da87c6d18d6953847ba72317cca862","1.6.4":"baf2bb1c2ec7c1bfccfc514ef1cef67907e056e4f7153bb5932ecb835c9cff78","1.6.5":"b6a07b3e575e5db97037118f76d6b93ec45e4d0a0c793acc984d5081fd011e83","1.6.6":"535bb041b99d5ac1bc9028ea88bc2fbf3dbadc80ea8dea236cc219123c194114","1.6.7":"d59af413e270e6f34b1b9a1c8c4acef35328f00e26fad447cfe214545af78d8f","1.6.8":"5dff5df3cb39c71d94d2523eb6e196c84f08528c139d6afebc9bcbffb5d2add4","1.6.9":"8512be4c7907f21d8c11762b0336425b73f0d230ddadb30cf042f72441521f6a"},"release":"1.6.0.dev16"}
+{"plans":{"1.3.0":"645ac6bdda8dc0a73c219aa3684a29df4bdd4032aad97a833b259de489b2ce32","1.3.1":"580381a4f6f40fc1bd4e903e591ad0d5c1db27daaccafc6f79dabf8c3b84259a","1.3.2":"7a69ffaf0c41438be25a656dcdc87783daac0eae79218d023648ef9d708e373f","1.4.0":"41c3a16e7819857a4b826e944fcfb4f79c58e7192cb151b106a3acd7487d5771","1.4.3":"a8cfbabff09d21944a822c4a70f23a7ee14960c4054de151c9fbc7cdb29adff5","1.4.4":"19508f66d84f1e16bd24932aaa17d45417912ffd1c20d326b2f003b931ac2f8c","1.5.0":"52d9d118da099abda0e0153cd16892e201681f6e4d3c6e5790284d1ac469a407","1.5.1":"d283cb8c01024338fb614ae2199744d883379f59579423e4eb9234f5c59ebdd8","1.5.10":"889e2f12614e6e67d342571c1c3bab8940659bfbbf43fa30a6847e73decb85d1","1.5.11":"4906e4de2b3a9c2f0b0181817c9dc168cb910ba6941691d4e86b8387802b624a","1.5.12":"c0a0dc085bb33d9718e869ed5effc2c1581deffd7ed0d5adc119b94312181625","1.5.13":"bfe58c8756f9b5f5e55d5acbb6f7cfc469d201004d312c14e022eb7c52369b7d","1.5.14":"a0464f11e05128cba8881e6295e591fce1ed1e8d43ab0e16710effb8e543d810","1.5.15":"0687a735cb4aaf8f8f74ad6e228ca1b14e045cba8821991c7d19fc9beaeac766","1.5.16":"3544ac754f39d56ecf2b06300b7cca1b6f8723f99885cd11bd690f1a704d3728","1.5.17":"cf1e9e0ff6812cb7092a82dd588392d625decbe3680fe003dfc554f9045809d3","1.5.18":"1fd873effa66b632217d674745722f712a48b36bb79957fefae722757a74bc30","1.5.2":"39fccb7582e13e7e3436861fde7b83ddb8057788cbde792f2f0cf7003f068850","1.5.3":"39fccb7582e13e7e3436861fde7b83ddb8057788cbde792f2f0cf7003f068850","1.5.4":"e86174ba5aff6f257f8a3f4721c7942885cd203469a9d8ddc15dbe6c704e0f45","1.5.5":"f93ed2d4342e447eb9900a0150331113918f2a8b3baeeb795c07231d80f0337c","1.5.6":"e3d90e6ceb20d760f1e9fa63224c5a070a16b3ca6e7dc4cc2c594138e929cce8","1.5.7":"a0464f11e05128cba8881e6295e591fce1ed1e8d43ab0e16710effb8e543d810","1.5.8":"f075b84fb04f4043658a28402d963494dd58481f164c0b371cec94322fe6d131","1.5.9":"ac170fc924019fc2acd69a90a82ba5c2552dce7a2c01a05e5407443e7a9e5af7","1.6.0":"c8286514d1a4f1805e727e13d3c350bb390378c6f31ad6920030412d61ec9b3f","1.6.1":"aa1d3934091853fc21208993930c1bf92e17136428d1d0baaefabfa65d13e7fa","1.6.10":"41c3a16e7819857a4b826e944fcfb4f79c58e7192cb151b106a3acd7487d5771","1.6.11":"d136203e08e3b052254403815d4ccedb555b0a297686fe97952d275eb1f322eb","1.6.12":"c328d4e36bd6277e01cef0140993e23970f4dff84425f3eba236cdd9a8954355","1.6.13":"f1f8b091d054a08665f047b5ad91f1f309f729a8aa30a2992d6ffdbd7f9fa7e4","1.6.14":"f1f8b091d054a08665f047b5ad91f1f309f729a8aa30a2992d6ffdbd7f9fa7e4","1.6.15":"8cfaeae24ceefe171d40241549c1f62527ce41821e5fd2904c0df1973596c0c7","1.6.16":"4b7e00dbe218a173ee83dd9cb32103f7129520352bdb4b11172d62e55df519c1","1.6.17":"d0197d4a4139f4801cbcfcfe8737ef98121270f6b7f1759ff4ab19ae2ccea9e1","1.6.18":"d0197d4a4139f4801cbcfcfe8737ef98121270f6b7f1759ff4ab19ae2ccea9e1","1.6.19":"4b7e00dbe218a173ee83dd9cb32103f7129520352bdb4b11172d62e55df519c1","1.6.2":"6ef96b5e00a04a929d16f0e4a136bfcc5b8132a466d6907a99b2c8516a8952d5","1.6.20":"28027c836eef19b21b95500760961e181f6078d22cccf8cca62b77bbbb11a0c5","1.6.21":"b0d0777e81edc8532d42bcd3b6d518fecd6078153dfe9f5f859469d2c13b369d","1.6.22":"cd5c9ac1e72631484891b96073a1c850d683b4763f65779ac5b349bfa0b79c9c","1.6.23":"4b7e00dbe218a173ee83dd9cb32103f7129520352bdb4b11172d62e55df519c1","1.6.24":"701460ed5e3ed236c8c7273ba0a98a0235786b4a04bd6c7aa6088fb835549aa6","1.6.3":"5c10db827bcb92b9322d4aa5751076b825da87c6d18d6953847ba72317cca862","1.6.4":"baf2bb1c2ec7c1bfccfc514ef1cef67907e056e4f7153bb5932ecb835c9cff78","1.6.5":"7b1e3d9322f22d198567d5cb73a3d4af0f89f3df200850d5cc66794ee817a30c","1.6.6":"535bb041b99d5ac1bc9028ea88bc2fbf3dbadc80ea8dea236cc219123c194114","1.6.7":"d59af413e270e6f34b1b9a1c8c4acef35328f00e26fad447cfe214545af78d8f","1.6.8":"5dff5df3cb39c71d94d2523eb6e196c84f08528c139d6afebc9bcbffb5d2add4","1.6.9":"8512be4c7907f21d8c11762b0336425b73f0d230ddadb30cf042f72441521f6a"},"release":"1.6.0.dev17"}

boneio-1.6.0.dev17/boneio/migrations/plans/manifest.sig

@@ -0,0 +1 @@
+�;��x0��>����!��'�o��϶�TCa9<)��������M�"��~:��o�����9am�

{boneio-1.6.0.dev16 → boneio-1.6.0.dev17}/boneio/migrations/runner.py

@@ -77,7 +77,7 @@ PIVOT_VERSIONS = frozenset({"1.6.5"})
 #: the whole queue — so a device whose pivot failed would never apply anything
 #: again. These are deferred instead: skipped, left pending, retried on the
 #: next start. Nothing ordered after one of these may depend on it.
-V2_ONLY_VERSIONS = frozenset({"1.6.11"})
+V2_ONLY_VERSIONS = frozenset({"1.6.11", "1.6.24"})
 APPLIED_DIR = Path("/var/lib/boneio/migrations.d")
 ASSETS_DIR = Path(__file__).parent / "assets"
 MANIFEST_PATH = ASSETS_DIR / "MANIFEST.sha256"

boneio-1.6.0.dev17/boneio/migrations/versions/v1_6_23_helper_fstab_options.py

@@ -0,0 +1,53 @@
+"""Reinstall the migration helper, which can now add options to fstab entries.
+
+1.6.24 marks the FAT boot partition ``nofail``, and no action could say that:
+fstab differs from device to device, so ``install_file`` cannot ship it whole.
+The new ``fstab_add_options`` action edits the options field of one mount
+point's entries and nothing else, and only with options the helper itself
+lists for that mount point.
+
+This is its own migration for the same reason as 1.6.19: the helper that runs
+a plan is the one that has to understand it, and the runner calls the helper
+afresh for each version, so 1.6.24 is read by this one. Pristine copy first, so
+``boneio-helpers-heal.service`` does not put the old helper back at the next
+boot.
+
+To retry on a device, delete ``/var/lib/boneio/migrations.d/1.6.23.applied``
+and restart boneIO.
+"""
+
+from __future__ import annotations
+
+from boneio.migrations.actions import InstallFile, MigrationAction
+
+VERSION = "1.6.23"
+DESCRIPTION = "Teach the migration helper to add fstab options"
+REQUIRES_ROOT = True
+
+_TRUSTED_DIR = "/usr/lib/boneio/trusted"
+
+
+def plan() -> list[MigrationAction]:
+    """Return the ordered list of migration actions.
+
+    Returns:
+        List of :class:`MigrationAction` to apply in order.
+    """
+    return [
+        InstallFile(
+            src="helpers/boneio-migrate-v2",
+            dst=f"{_TRUSTED_DIR}/boneio-migrate-v2",
+            mode=0o755,
+            owner="root",
+            group="root",
+            validate="python",
+        ),
+        InstallFile(
+            src="helpers/boneio-migrate-v2",
+            dst="/usr/sbin/boneio-migrate-v2",
+            mode=0o755,
+            owner="root",
+            group="root",
+            validate="python",
+        ),
+    ]