From 84760de4da1364f003ae2321c421b75d4b1c73a7 Mon Sep 17 00:00:00 2001 From: "michael.hudson@canonical.com" Date: Wed, 11 Feb 2026 06:28:12 +1300 Subject: [PATCH] rename the Daily|Release in .disk/info from "official" to "iso_status" --- live-build/auto/config | 2 +- live-build/gen-iso-ids | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index fb44849c..f7739672 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1700,7 +1700,7 @@ EOF fi if [ "${MAKE_ISO}" = "yes" ]; then - # XXX should pass --official here. + # XXX should pass --iso-status here. /usr/share/livecd-rootfs/live-build/gen-iso-ids \ --project $PROJECT ${SUBPROJECT:+--subproject $SUBPROJECT} \ --arch $ARCH ${SUBARCH:+--subarch $SUBARCH} ${NOW+--serial $NOW} \ diff --git a/live-build/gen-iso-ids b/live-build/gen-iso-ids index 50707f75..6f9d57b0 100755 --- a/live-build/gen-iso-ids +++ b/live-build/gen-iso-ids @@ -59,7 +59,7 @@ def make_disk_info( subarch: str, capproject: str, subproject: str, - official: str, + iso_status: str, serial: str, ) -> str: # os-release VERSION is _almost_ what goes into .disk/info... @@ -82,7 +82,7 @@ def make_disk_info( if subarch: fullarch += "+" + subarch - return f"{capproject}{capsubproject} {version} - {official} {fullarch} ({serial})" + return f"{capproject}{capsubproject} {version} - {iso_status} {fullarch} ({serial})" def make_vol_id(os_release: dict[str, str], arch: str, capproject: str) -> str: @@ -146,7 +146,7 @@ def make_vol_id(os_release: dict[str, str], arch: str, capproject: str) -> str: default=time.strftime("%Y%m%d"), ) @click.option( - "--official", + "--iso-status", type=str, default="Daily", ) @@ -162,7 +162,7 @@ def main( arch: str, subarch: str, serial: str, - official: str, + iso_status: str, output_dir: pathlib.Path, ): output_dir.mkdir(exist_ok=True) @@ -177,7 +177,7 @@ def main( subarch, capproject, subproject, - official, + iso_status, serial, ) print(f"disk_info: {disk_info!r}")