pixie-lab 0.4.2__py3-none-any.whl → 0.4.4__py3-none-any.whl

pixie/events/_kinds.py

@@ -196,23 +196,12 @@ EVENTS_CLEARED = "events.cleared"
 right after the wipe so the freshly-empty log still records who reset
 it and when; carries the deleted-row count in ``details``."""
 
-# ---------- live-env fetch ------------------------------------------
-#
-# The operator "Fetch live-env" action pulls the netboot-pc bake into
-# PIXIE_LIVE_ENV_DIR. No subject (``subject_kind`` = ""): the live env
-# is per-pixie, not per-resource. Dotted ``.done`` / ``.failed`` names
-# mirror the catalog-fetch kinds so ``.failed`` auto-classifies as an
-# error via the ERROR_KINDS ``LIKE '%.failed'`` probe.
-
-LIVE_ENV_FETCH_DONE = "live_env.fetch.done"
-"""``POST /ui/live-env/fetch`` downloaded + staged vmlinuz + initrd +
-live.squashfs into PIXIE_LIVE_ENV_DIR. Carries the src + content sha in
-``details``."""
+# ---------- live env ------------------------------------------------
 
-LIVE_ENV_FETCH_FAILED = "live_env.fetch.failed"
-"""The live-env fetch failed (bad src scheme, download error, or a
-tarball missing a required file). Carries the src + error in
-``details``."""
+LIVE_ENV_IMAGE_SELECTED = "live_env.image.selected"
+"""The one-click "Set up live env" action fetched the pixie-live-env
+image + its bundle and selected the image (set ``live_env.image_sha``).
+Carries the selected ``image_sha`` in ``details``."""
 
 
 # The canonical closed set. Every kind above is registered here; the
@@ -248,8 +237,7 @@ KNOWN_EVENT_KINDS: frozenset[str] = frozenset(
         AUTH_LOGIN_SUCCEEDED,
         AUTH_LOGIN_FAILED,
         EVENTS_CLEARED,
-        LIVE_ENV_FETCH_DONE,
-        LIVE_ENV_FETCH_FAILED,
+        LIVE_ENV_IMAGE_SELECTED,
     }
 )
 

pixie/pxe/_renderer.py

@@ -91,12 +91,12 @@ class RenderContext:
     # no-op is a legal value.
     extra_cmdline: str = ""
     # Disk-image content sha the live-env boot modes boot over
-    # ephemeral nbdboot instead of the Debian live-boot squashfs.
-    # Operator-set via PIXIE_LIVE_ENV_IMAGE_SHA / the Live env page.
-    # Empty (default) keeps the squashfs path so existing deploys are
-    # untouched; when set, ``render`` streams this image over NBD for
-    # every LIVE_ENV_MODES machine (the machine's own bind still drives
-    # what GET /pxe/<mac>/plan returns, so the on-target CLI dispatches
+    # ephemeral nbdboot. Operator-set via PIXIE_LIVE_ENV_IMAGE_SHA /
+    # the Live env page. Empty means no live-env image is configured,
+    # so LIVE_ENV_MODES machines degrade to the ``unavailable`` plan;
+    # when set, ``render`` streams this image over NBD for every
+    # LIVE_ENV_MODES machine (the machine's own bind still drives what
+    # GET /pxe/<mac>/plan returns, so the on-target CLI dispatches
     # inventory / interactive / flash correctly).
     live_env_image_sha: str = ""
 
@@ -113,7 +113,6 @@ class PlanRenderer:
         overlays: OverlaysStore,
         nbd: NbdServer,
         overlays_dir: Path,
-        live_env_dir: Path | None = None,
         events: Any = None,
     ) -> None:
         self._catalog = catalog
@@ -128,29 +127,12 @@ class PlanRenderer:
         # booted) land alongside the rest of pixie's audit trail. None
         # for unit tests that don't wire an events sink.
         self._events = events
-        # Where the netboot-pc bake's vmlinuz + initrd + squashfs are
-        # staged on disk. When set + the three files exist, the
-        # ``pixie-*`` boot modes chain into the live env; otherwise
-        # they fall back to the ``unavailable`` plan so a bound
-        # target does not silently boot nothing.
-        self._live_env_dir = live_env_dir
         self._env = Environment(
             loader=FileSystemLoader(str(_TEMPLATES_DIR)),
             autoescape=select_autoescape(disabled_extensions=("j2",)),
             keep_trailing_newline=True,
         )
 
-    def _live_env_ready(self) -> bool:
-        """True iff the netboot-pc artifacts are staged on disk under
-        ``self._live_env_dir``. Called per-render so an operator
-        dropping the files in without a pixie restart takes effect
-        on the next PXE hit."""
-        if self._live_env_dir is None:
-            return False
-        return all(
-            (self._live_env_dir / name).is_file() for name in ("vmlinuz", "initrd", "live.squashfs")
-        )
-
     def render(self, machine: Machine, ctx: RenderContext) -> str:
         mode = machine.boot_mode
         # Per-machine ``extra_cmdline`` fully overrides the deploy-wide
@@ -341,52 +323,37 @@ class PlanRenderer:
     ) -> str:
         """Render a plan for one of the ``LIVE_ENV_MODES``.
 
-        Two deliveries, picked by ``ctx.live_env_image_sha``
-        (PIXIE_LIVE_ENV_IMAGE_SHA / the Live env page):
-
-        * Set -> boot that disk image over EPHEMERAL nbdboot, the same
-          code path the ``nbdboot`` mode uses. Proven on hardware to
-          bring the NIC up via dracut where the squashfs live-boot
-          hangs in the initramfs on some boards. If the configured
-          image or its netboot bundle isn't fetched, degrade to
-          ``unavailable`` (matching how ``nbdboot`` degrades) rather
-          than silently falling back -- a configured-but-broken live
-          env is an operator error worth surfacing.
-        * Unset -> the historical Debian live-boot squashfs
-          (``pixie-live-env.j2``), or ``unavailable`` when the
-          netboot-pc bake artifacts have not been staged.
-
-        Either way the machine's OWN ``boot_mode`` still drives what
+        The live env boots the disk image named by
+        ``ctx.live_env_image_sha`` (PIXIE_LIVE_ENV_IMAGE_SHA / the Live
+        env page) over EPHEMERAL nbdboot, the same code path the
+        ``nbdboot`` mode uses -- proven on hardware to bring the NIC up
+        via dracut where the retired Debian live-boot squashfs hung in
+        the initramfs on some boards. If no image is configured, or the
+        configured image / its netboot bundle isn't fetched, degrade to
+        ``unavailable`` (matching how ``nbdboot`` degrades) rather than
+        booting nothing -- a live-env mode with no bootable image is an
+        operator setup gap worth surfacing.
+
+        The machine's OWN ``boot_mode`` still drives what
         ``GET /pxe/<mac>/plan`` returns, so the on-target pixie CLI
-        dispatches inventory / interactive / flash exactly as before."""
+        dispatches inventory / interactive / flash accordingly."""
         live_env_sha = ctx.live_env_image_sha
-        if live_env_sha:
-            resolved = self._resolve_bundle_and_blob(live_env_sha)
-            if isinstance(resolved, str):
-                return self._unavailable(
-                    machine,
-                    f"live-env image {live_env_sha[:12]} not bootable: {resolved}",
-                )
-            bundle_entry, blob = resolved
-            return self._render_ephemeral_nbdboot(
-                machine, ctx, live_env_sha, bundle_entry, blob, extra_cmdline
+        if not live_env_sha:
+            return self._unavailable(
+                machine,
+                f"boot_mode={mode!r} needs a live-env image; set "
+                "PIXIE_LIVE_ENV_IMAGE_SHA (or the Live env page) to a "
+                "fetched image's content sha",
             )
-        if not self._live_env_ready():
-            # netboot-pc bake artifacts have not been staged on this
-            # deploy yet; degrade to the readable unavailable plan so a
-            # bound target lands on a legible screen instead of a
-            # bty-media initrd.
+        resolved = self._resolve_bundle_and_blob(live_env_sha)
+        if isinstance(resolved, str):
             return self._unavailable(
                 machine,
-                f"boot_mode={mode!r} needs pixie live-env media; "
-                f"stage vmlinuz+initrd+squashfs under $PIXIE_LIVE_ENV_DIR",
+                f"live-env image {live_env_sha[:12]} not bootable: {resolved}",
             )
-        return self._env.get_template("pixie-live-env.j2").render(
-            mac=machine.mac,
-            boot_mode=mode,
-            host=ctx.host,
-            port=ctx.port,
-            extra_cmdline=extra_cmdline,
+        bundle_entry, blob = resolved
+        return self._render_ephemeral_nbdboot(
+            machine, ctx, live_env_sha, bundle_entry, blob, extra_cmdline
         )
 
     def _unavailable(self, machine: Machine, reason: str) -> str:

pixie/web/_settings_store.py

@@ -74,29 +74,16 @@ ENV_LIVE_ENV_EXTRA_CMDLINE = "PIXIE_LIVE_ENV_EXTRA_CMDLINE"
 # it never reaches a kernel cmdline.
 _UNEXPANDED_ENV_PLACEHOLDER = re.compile(r"^\$\{[A-Za-z_][A-Za-z0-9_]*(:[-+?=]?[^}]*)?\}$")
 
-# Where the operator "Fetch live-env" action pulls the netboot-pc bake
-# from: a single tarball ``src`` (``https://`` or ``oras://``, the same
-# schemes the catalog fetch speaks) that unpacks to vmlinuz + initrd +
-# live.squashfs. Defaults to the pixie GitHub release's stable-named
-# asset via ``/releases/latest/download/`` so a plain deploy can pull
-# the live env with no config; override for an air-gapped mirror.
-KEY_LIVE_ENV_SRC = "live_env.src"
-ENV_LIVE_ENV_SRC = "PIXIE_LIVE_ENV_SRC"
-DEFAULT_LIVE_ENV_SRC = (
-    "https://github.com/safl/pixie/releases/latest/download/pixie-live-env-x86_64.tar.gz"
-)
-
 # Disk-image content sha the live-env boot modes
 # (pixie-inventory / -tui / -flash-once / -flash-always) boot over
-# EPHEMERAL nbdboot instead of the Debian live-boot squashfs. When set
-# (and the named image + its netboot bundle are fetched) the renderer
-# streams this image over NBD -- proven on hardware to bring the NIC up
-# via dracut where the squashfs live-boot hangs in the initramfs on some
-# boards. Empty (the default) keeps the historical squashfs path so
-# existing deploys are untouched. Resolution: DB override -> env ->
-# empty. A value that is not 64 lowercase hex chars is treated as unset
-# so a fat-fingered setting degrades to the squashfs path rather than
-# sending every live-env boot into the unavailable plan.
+# EPHEMERAL nbdboot. When set (and the named image + its netboot bundle
+# are fetched) the renderer streams this image over NBD -- proven on
+# hardware to bring the NIC up via dracut where the retired squashfs
+# live-boot hung in the initramfs on some boards. Empty (the default)
+# means those modes degrade to the unavailable plan. Resolution: DB
+# override -> env -> empty. A value that is not 64 lowercase hex chars
+# is treated as unset so a fat-fingered setting degrades to unavailable
+# cleanly.
 KEY_LIVE_ENV_IMAGE_SHA = "live_env.image_sha"
 ENV_LIVE_ENV_IMAGE_SHA = "PIXIE_LIVE_ENV_IMAGE_SHA"
 
@@ -216,17 +203,6 @@ class SettingsStore:
             return env
         return ""
 
-    def resolve_live_env_src(self) -> str:
-        """Effective live-env fetch src: DB override -> env -> default
-        (the pixie GitHub release asset). Never empty; the caller feeds
-        it straight to the live-env fetch, which raises on a bad
-        scheme."""
-        return (
-            self.get(KEY_LIVE_ENV_SRC)
-            or (os.environ.get(ENV_LIVE_ENV_SRC) or "").strip()
-            or DEFAULT_LIVE_ENV_SRC
-        )
-
     def resolve_live_env_image_sha(self) -> str:
         """Effective live-env disk-image content sha: DB override -> env
         -> empty.

pixie/web/_templates/dashboard.html

@@ -126,67 +126,45 @@
     </div>
 </div>
 
-{# Live-env media readiness (OUTPUT ONLY). The dashboard reports
-   whether the pixie-* boot modes have their media; the Fetch action +
-   source / cmdline config live on the dedicated /ui/live-env pane. #}
-{% set lfs = stats.live_env_fetch_state or {} %}
+{# Live-env readiness (OUTPUT ONLY). The dashboard reports whether the
+   pixie-* boot modes have a bootable image selected; the image + cmdline
+   config live on the dedicated /ui/live-env pane. #}
 <div class="card shadow-sm mb-4">
     <div class="card-header bg-light d-flex align-items-center gap-2">
-        <h2 class="h5 mb-0"><i class="bi bi-boombox me-2"></i>Live-env media</h2>
+        <h2 class="h5 mb-0"><i class="bi bi-boombox me-2"></i>Live env</h2>
         <div class="ms-auto d-flex align-items-center gap-2">
-            {% if lfs.state == 'fetching' %}
-            <span class="badge text-bg-info"><span class="spinner-border spinner-border-sm me-1" role="status"></span>fetching</span>
-            {% elif stats.live_env_ready %}
+            {% if stats.live_env_ready %}
             <span class="badge text-bg-success"><i class="bi bi-check-circle me-1"></i>ready</span>
             {% else %}
-            <span class="badge text-bg-warning"><i class="bi bi-exclamation-triangle me-1"></i>not staged</span>
+            <span class="badge text-bg-warning"><i class="bi bi-exclamation-triangle me-1"></i>not ready</span>
             {% endif %}
             <a href="/ui/live-env" class="btn btn-sm btn-outline-primary text-nowrap"
-               title="Fetch + configure the live env">
+               title="Select + configure the live env">
                 <i class="bi bi-boombox me-1"></i>Manage
             </a>
         </div>
     </div>
     <div class="card-body">
         {% if stats.live_env_ready %}
-        <p class="small mb-2">
-            Staged at <code>{{ stats.live_env_dir }}</code>;
+        <p class="small mb-0">
+            Image <code>{{ stats.live_env_image_sha[:12] }}</code> selected and fetched;
             <code>pixie-tui</code> / <code>pixie-inventory</code> /
-            <code>pixie-flash-*</code> can serve the live env.
+            <code>pixie-flash-*</code> boot it over ephemeral nbdboot.
         </p>
-        {% else %}
-        <p class="small text-warning mb-2">
-            Live-env media is missing under <code>{{ stats.live_env_dir or '(unset)' }}</code>.
-            Every <code>pixie-*</code> boot_mode falls back to the "unavailable" iPXE
-            plan until it is staged. <a href="/ui/live-env">Fetch it &rarr;</a>
+        {% elif stats.live_env_image_sha %}
+        <p class="small text-warning mb-0">
+            Live-env image <code>{{ stats.live_env_image_sha[:12] }}</code> is selected but
+            not fetched. Every <code>pixie-*</code> boot_mode falls back to the "unavailable"
+            iPXE plan until the image is fetched. <a href="/ui/catalog">Fetch it &rarr;</a>
         </p>
-        {% endif %}
-        {% if lfs.state == 'error' %}
-        <p class="small text-danger mb-2">
-            <i class="bi bi-exclamation-triangle me-1"></i>Last fetch failed &mdash; see
-            <a href="/ui/live-env">Live env</a>.
+        {% else %}
+        <p class="small text-warning mb-0">
+            No live-env image selected. Every <code>pixie-*</code> boot_mode falls back to the
+            "unavailable" iPXE plan until one is set. <a href="/ui/live-env">Select it &rarr;</a>
         </p>
         {% endif %}
-        <dl class="row small mb-0">
-            {% for name, size in stats.live_env_files.items() %}
-            <dt class="col-sm-3 font-monospace">{{ name }}</dt>
-            <dd class="col-sm-9">
-                {% if size is not none %}
-                <span class="text-success"><i class="bi bi-check-circle me-1"></i>{{ (size / 1024 / 1024) | round(1) }} MiB</span>
-                {% else %}
-                <span class="text-warning"><i class="bi bi-x-circle me-1"></i>missing</span>
-                {% endif %}
-            </dd>
-            {% endfor %}
-        </dl>
     </div>
 </div>
-{% if lfs.state == 'fetching' %}
-{# The fetch runs on the server's thread pool; poll the page so the
-   spinner flips to "ready" (or an error) on its own. A big squashfs
-   download takes a while, so 5 s is frequent enough without hammering. #}
-<script>setTimeout(function () { location.reload(); }, 5000);</script>
-{% endif %}
 
 <div class="card shadow-sm">
     <div class="card-header bg-light d-flex align-items-center">

pixie/web/_templates/live_env.html

@@ -6,8 +6,8 @@
 <nav class="navbar subnav-strip" aria-label="Section sub-navigation">
     <div class="container">
         <span class="subnav-jumps d-flex align-items-center flex-wrap">
-            <a href="#media">Media</a>
-            <a href="#fetch">Fetch</a>
+            <a href="#setup">Setup</a>
+            <a href="#advanced">Advanced</a>
             <a href="#options">Options</a>
         </span>
     </div>
@@ -15,104 +15,108 @@
 {% endblock %}
 
 {% block content %}
-{% set lfs = live_env_fetch_state or {} %}
-{{ page_description('boombox', 'The pixie live env (netboot-pc bake: vmlinuz + initrd + live.squashfs) that the pixie-flash-once / pixie-flash-always / pixie-inventory / pixie-tui boot modes chain into. Fetch it from the configured source, or point that source at a mirror. Until all three files are staged, those boot modes fall back to an "unavailable" iPXE plan.') }}
+{% set ss = live_env_setup_state or {} %}
+{{ page_description('boombox', 'The pixie live env that the pixie-inventory / pixie-tui / pixie-flash-once / pixie-flash-always boot modes boot into: a disk image (the pixie-live-env catalog entry) booted over ephemeral nbdboot. Click Set up live env to fetch it and select it in one step; until then those boot modes render an "unavailable" plan.') }}
 
 {% if flash_error %}
 <div class="alert alert-danger py-2">{{ flash_error }}</div>
 {% endif %}
 
-{# ---- Media state (output) --------------------------------------- #}
-<div class="card shadow-sm mb-4" id="media">
+{# ---- One-click setup -------------------------------------------- #}
+<div class="card shadow-sm mb-4" id="setup">
     <div class="card-header bg-light d-flex align-items-center gap-2">
-        <h2 class="h5 mb-0"><i class="bi bi-boombox me-2"></i>Staged media</h2>
+        <h2 class="h5 mb-0"><i class="bi bi-boombox me-2"></i>Live env</h2>
         {% if live_env_ready %}
         <span class="badge text-bg-success ms-auto"><i class="bi bi-check-circle me-1"></i>ready</span>
+        {% elif ss.state == 'running' %}
+        <span class="badge text-bg-info ms-auto"><span class="spinner-border spinner-border-sm me-1" role="status"></span>setting up</span>
         {% else %}
-        <span class="badge text-bg-warning ms-auto"><i class="bi bi-exclamation-triangle me-1"></i>not staged</span>
+        <span class="badge text-bg-warning ms-auto"><i class="bi bi-exclamation-triangle me-1"></i>not set up</span>
         {% endif %}
     </div>
     <div class="card-body">
-        <p class="small text-muted mb-2">
-            Staged under <code>{{ live_env_dir or '(unset)' }}</code>, served to targets at
-            <code>/boot/pixie-live-env/</code>. The renderer re-checks these files on every
-            <code>GET /pxe/&lt;mac&gt;</code>, so a fresh fetch takes effect without a restart.
+        {% if live_env_ready %}
+        <p class="small mb-3">
+            Image <code>{{ live_env_image_sha.effective[:12] }}</code> is fetched and
+            selected; the <code>pixie-inventory</code> / <code>pixie-tui</code> /
+            <code>pixie-flash-*</code> modes nbdboot it. Nothing else to do.
+        </p>
+        {% else %}
+        <p class="small mb-3">
+            One click fetches the <code>pixie-live-env</code> image (~900&nbsp;MiB) +
+            its arch-headless netboot bundle from the catalog, then selects the image.
+            No catalog hopping or sha copying. It runs on the server; you can leave
+            this page. Re-running when everything is already fetched just re-selects.
         </p>
-        <dl class="row small mb-0">
-            {% for name, size in live_env_files.items() %}
-            <dt class="col-sm-3 font-monospace">{{ name }}</dt>
-            <dd class="col-sm-9">
-                {% if size is not none %}
-                <span class="text-success"><i class="bi bi-check-circle me-1"></i>{{ (size / 1024 / 1024) | round(1) }} MiB</span>
+        {% endif %}
+
+        {# Progress (polled live while a setup runs). #}
+        <div id="setup-progress" class="{% if ss.state != 'running' %}d-none{% endif %} mb-3">
+            <div class="d-flex align-items-center gap-2 small mb-1">
+                <span class="spinner-border spinner-border-sm" role="status"></span>
+                <span id="setup-step">Fetching {{ ss.step or 'live env' }}{% if ss.phase %} ({{ ss.phase }}){% endif %}...</span>
+            </div>
+            <div class="progress" role="progressbar" style="height: 1.1rem;">
+                <div id="setup-bar" class="progress-bar progress-bar-striped progress-bar-animated"
+                     style="width: {% if ss.total_bytes %}{{ (100 * ss.bytes_downloaded / ss.total_bytes) | round(0, 'floor') }}{% else %}100{% endif %}%"></div>
+            </div>
+        </div>
+        <div id="setup-error" class="alert alert-danger py-2 small {% if ss.state != 'error' %}d-none{% endif %}">
+            <i class="bi bi-exclamation-triangle me-1"></i><span id="setup-error-msg">{{ ss.error }}</span>
+        </div>
+
+        <form method="post" action="/ui/live-env/setup" class="m-0">
+            <button type="submit" class="btn {% if live_env_ready %}btn-outline-secondary{% else %}btn-primary{% endif %}"
+                    id="setup-btn" {% if ss.state == 'running' %}disabled{% endif %}>
+                {% if ss.state == 'running' %}
+                <span class="spinner-border spinner-border-sm me-1" role="status"></span>Setting up...
                 {% else %}
-                <span class="text-warning"><i class="bi bi-x-circle me-1"></i>missing</span>
+                <i class="bi bi-boombox me-1"></i>{% if live_env_ready %}Re-run setup{% else %}Set up live env{% endif %}
                 {% endif %}
-            </dd>
-            {% endfor %}
-        </dl>
+            </button>
+            <span class="text-muted small ms-2">Fetch + select in one step.</span>
+        </form>
     </div>
 </div>
 
-{# ---- Fetch (action) --------------------------------------------- #}
-<div class="card shadow-sm mb-4" id="fetch">
+{# ---- Advanced: select by content sha ---------------------------- #}
+<div class="card shadow-sm mb-4" id="advanced">
     <div class="card-header bg-light fw-semibold">
-        <i class="bi bi-cloud-download me-1"></i>Fetch live env
+        <i class="bi bi-sliders me-1"></i>Advanced: select by content sha
     </div>
     <div class="card-body">
-        {% if lfs.state == 'fetching' %}
-        <div class="alert alert-info py-2 small">
-            <span class="spinner-border spinner-border-sm me-1" role="status"></span>
-            Fetching live-env{% if lfs.phase %} ({{ lfs.phase }}){% endif %}... this can take a while for the ~1&nbsp;GiB squashfs.
-        </div>
-        {% elif lfs.state == 'error' %}
-        <div class="alert alert-danger py-2 small">
-            <i class="bi bi-exclamation-triangle me-1"></i>Last fetch failed: {{ lfs.error }}
-        </div>
-        {% elif lfs.state == 'done' %}
-        <div class="alert alert-success py-2 small">
-            <i class="bi bi-check-circle me-1"></i>Last fetch staged the live env{% if lfs.sha256 %} (sha {{ lfs.sha256[:12] }}){% endif %}.
-        </div>
-        {% endif %}
-
-        {# Editable source, then the fetch button that consumes it. #}
-        <form method="post" action="/ui/live-env/src/edit" class="row g-2 align-items-end mb-3">
-            <div class="col-12 col-lg-9">
-                <label for="live_env_src" class="form-label mb-1">
-                    Source
-                    <span class="badge text-bg-{% if live_env_src.override %}primary{% else %}secondary{% endif %} ms-1">
-                        {% if live_env_src.override %}override{% elif live_env_src.effective != live_env_src.default %}env{% else %}default{% endif %}
+        <p class="small text-muted mb-3">
+            Manual override of what Set up above does automatically: point the live env
+            at a specific fetched image by its <code>content_sha256</code> (from its
+            <a href="/ui/catalog">Catalog</a> row). The image plus its netboot bundle
+            (via the entry's <code>netboot_src</code>) must both be fetched.
+        </p>
+        <form method="post" action="/ui/live-env/image/edit" class="row g-3">
+            <div class="col-12">
+                <label for="live_env_image_sha" class="form-label">
+                    Image content sha
+                    <span class="badge text-bg-{% if live_env_image_sha.override %}primary{% else %}secondary{% endif %} ms-1">
+                        {% if live_env_image_sha.override %}override{% elif live_env_image_sha.effective %}env{% else %}unset{% endif %}
                     </span>
                 </label>
-                <input type="text" id="live_env_src" name="live_env_src"
+                <input type="text" id="live_env_image_sha" name="live_env_image_sha"
                        class="form-control font-monospace"
-                       value="{{ live_env_src.override }}"
-                       placeholder="{{ live_env_src.default }}">
-            </div>
-            <div class="col-12 col-lg-3">
-                <button type="submit" class="btn btn-outline-secondary w-100">
-                    <i class="bi bi-check2 me-1"></i>Save source
-                </button>
-            </div>
-            <div class="col-12">
+                       value="{{ live_env_image_sha.override }}"
+                       placeholder="(unset - live-env modes render the unavailable plan)"
+                       pattern="[0-9a-fA-F]{64}">
                 <div class="form-text">
-                    Tarball to download (<code>https://</code> or <code>oras://</code>); must unpack to
-                    <code>vmlinuz</code> + <code>initrd</code> + <code>live.squashfs</code>. Blank falls
-                    back to <code>{{ live_env_src.env }}</code> then the latest pixie GitHub release.
-                    Effective: <code>{{ live_env_src.effective }}</code>.
-                    {% if live_env_src.updated_at %}<br>Last updated: <code>{{ live_env_src.updated_at | fmt_ts }}</code>.{% endif %}
+                    Blank falls back to <code>{{ live_env_image_sha.env }}</code> then unset.
+                    Effective:
+                    {% if live_env_image_sha.effective %}<code>{{ live_env_image_sha.effective }}</code>{% else %}<em class="text-muted">(none)</em>{% endif %}.
+                    {% if live_env_image_sha.updated_at %}<br>Last updated: <code>{{ live_env_image_sha.updated_at | fmt_ts }}</code>.{% endif %}
                 </div>
             </div>
-        </form>
-
-        <form method="post" action="/ui/live-env/fetch" class="m-0">
-            <button type="submit" class="btn btn-primary" {% if lfs.state == 'fetching' %}disabled{% endif %}>
-                {% if lfs.state == 'fetching' %}
-                <span class="spinner-border spinner-border-sm me-1" role="status"></span>Fetching...
-                {% else %}
-                <i class="bi bi-cloud-download me-1"></i>{% if live_env_ready %}Re-fetch live env{% else %}Fetch live env{% endif %}
-                {% endif %}
-            </button>
-            <span class="text-muted small ms-2">Downloads + stages the three files; overwrites what's there.</span>
+            <div class="col-12">
+                <button type="submit" class="btn btn-outline-secondary"><i class="bi bi-check2 me-1"></i>Save</button>
+                <span class="text-muted small ms-2">
+                    Takes effect on the NEXT <code>GET /pxe/&lt;mac&gt;</code>; a target already mid-boot must be power-cycled.
+                </span>
+            </div>
         </form>
     </div>
 </div>
@@ -120,7 +124,7 @@
 {# ---- Options (config) ------------------------------------------- #}
 <div class="card shadow-sm mb-4" id="options">
     <div class="card-header bg-light fw-semibold">
-        <i class="bi bi-sliders me-1"></i>Options
+        <i class="bi bi-gear me-1"></i>Options
     </div>
     <div class="card-body">
         <form method="post" action="/ui/live-env/cmdline/edit" class="row g-3">
@@ -140,7 +144,7 @@
                     <option value="pci=realloc=on,nocrs">
                 </datalist>
                 <div class="form-text">
-                    Tokens appended verbatim to the <code>pixie-live-env</code> kernel cmdline
+                    Tokens appended verbatim to the live-env kernel cmdline
                     (after <code>pixie.mac=</code> / <code>bty.mac=</code>, so last-token-wins on any
                     conflict). Whitespace-separated; single line. Blank falls back to
                     <code>{{ live_env_extra_cmdline.env }}</code> then no append. A machine with its own
@@ -158,48 +162,36 @@
                 </span>
             </div>
         </form>
-
-        <hr class="my-4">
-
-        <form method="post" action="/ui/live-env/image/edit" class="row g-3">
-            <div class="col-12">
-                <label for="live_env_image_sha" class="form-label">
-                    Boot live env as disk image (nbdboot)
-                    <span class="badge text-bg-{% if live_env_image_sha.override %}primary{% else %}secondary{% endif %} ms-1">
-                        {% if live_env_image_sha.override %}override{% elif live_env_image_sha.effective %}env{% else %}default{% endif %}
-                    </span>
-                </label>
-                <input type="text" id="live_env_image_sha" name="live_env_image_sha"
-                       class="form-control font-monospace"
-                       value="{{ live_env_image_sha.override }}"
-                       placeholder="(unset - use the live-boot squashfs above)"
-                       pattern="[0-9a-fA-F]{64}">
-                <div class="form-text">
-                    A fetched disk-image's <code>content_sha256</code> (64 hex). When set - and that
-                    image plus its netboot bundle are fetched - the <code>pixie-inventory</code> /
-                    <code>pixie-tui</code> / <code>pixie-flash-*</code> modes boot it over
-                    <strong>ephemeral nbdboot</strong> instead of fetching the squashfs. dracut brings
-                    the NIC up where the live-boot squashfs hangs in the initramfs on some boards; the
-                    on-target pixie CLI still phones home so inventory / flash work unchanged. Blank
-                    falls back to <code>{{ live_env_image_sha.env }}</code> then the squashfs path.
-                    Effective:
-                    {% if live_env_image_sha.effective %}<code>{{ live_env_image_sha.effective }}</code>{% else %}<em class="text-muted">(none - squashfs)</em>{% endif %}.
-                    {% if live_env_image_sha.updated_at %}<br>Last updated: <code>{{ live_env_image_sha.updated_at | fmt_ts }}</code>.{% endif %}
-                </div>
-            </div>
-            <div class="col-12">
-                <button type="submit" class="btn btn-primary"><i class="bi bi-check2 me-1"></i>Save</button>
-                <span class="text-muted small ms-2">
-                    Takes effect on the NEXT <code>GET /pxe/&lt;mac&gt;</code>; a target already mid-boot must be power-cycled.
-                </span>
-            </div>
-        </form>
     </div>
 </div>
 
-{% if lfs.state == 'fetching' %}
-{# The fetch runs on the server's thread pool; reload so the spinner
-   flips to ready / error on its own. #}
-<script>setTimeout(function () { location.reload(); }, 5000);</script>
-{% endif %}
+{# Poll setup progress while a run is in flight; reload when it lands
+   so the ready badge + selected sha update. #}
+<script>
+(function () {
+    if ("{{ ss.state }}" !== "running") return;
+    var box = document.getElementById("setup-progress");
+    var step = document.getElementById("setup-step");
+    var bar = document.getElementById("setup-bar");
+    function poll() {
+        fetch("/ui/live-env/setup-state.json", { headers: { "Accept": "application/json" } })
+            .then(function (r) { return r.json(); })
+            .then(function (s) {
+                if (!s || s.state === "running") {
+                    if (step) step.textContent = "Fetching " + (s.step || "live env") +
+                        (s.phase ? " (" + s.phase + ")" : "") + "...";
+                    if (bar && s.total_bytes) {
+                        bar.style.width = Math.floor(100 * s.bytes_downloaded / s.total_bytes) + "%";
+                    }
+                    setTimeout(poll, 1500);
+                } else {
+                    // done or error -> reload to render the final state.
+                    location.reload();
+                }
+            })
+            .catch(function () { setTimeout(poll, 3000); });
+    }
+    setTimeout(poll, 1500);
+})();
+</script>
 {% endblock %}