Skip to content

Commit 5be12b4

Browse files
daniel-g-carrascodaniel-g-carrasco
authored
feat(brand): the public product name is Margine OS (#309)
Fixed together with the DistroWatch submission. os-release now says Margine OS in NAME, PRETTY_NAME, VERSION and VARIANT (GNOME About, hostnamectl, BLS boot entries), with the About Website link finally pointing at https://margine.dev instead of GitHub. Archive ISO titles and the download index read Margine OS, README leads with the full name, and the validator expects the new NAME. The naming policy lives in docs/BRANDING.md: Margine stays as the short form in running text, and the technical identifiers (VARIANT_ID=margine, which countme keys on, margine-* names, Archive identifiers, the image name) deliberately never change.
1 parent 612f602 commit 5be12b4

6 files changed

Lines changed: 42 additions & 22 deletions

File tree

‎.github/workflows/build-disk.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -804,12 +804,12 @@ jobs:
804804
ISO_TAG="${{ github.event_name == 'workflow_run' && 'nvidia' || inputs.image_tag || 'stable' }}"
805805
if [[ "$ISO_TAG" == "stable" ]]; then VSLUG="live"; VLABEL=""; else VSLUG="$ISO_TAG"; VLABEL=" ${ISO_TAG^^}"; fi
806806
IDENTIFIER="${{ matrix.image }}-${VSLUG}-iso-${DATE_TAG}"
807-
TITLE="Margine${VLABEL} Linux ISO ${DATE_TAG}"
808-
DESCRIPTION="Margine${VLABEL} live ISO (Titanoboa) — bootable GNOME live session with the Anaconda installer. Bluefin DX + CachyOS signed kernel + Margine deltas. Built on ${DATE_TAG} from commit ${{ github.sha }}. Source: https://github.com/${{ github.repository }}"
807+
TITLE="Margine OS${VLABEL} Linux ISO ${DATE_TAG}"
808+
DESCRIPTION="Margine OS${VLABEL} live ISO (Titanoboa): bootable GNOME live session with the Anaconda installer. Bluefin DX + CachyOS signed kernel + Margine deltas. Built on ${DATE_TAG} from commit ${{ github.sha }}. Website: https://margine.dev. Source: https://github.com/${{ github.repository }}"
809809
if [[ "${{ github.event_name }}" == "workflow_run" ]]; then
810810
IDENTIFIER="${{ matrix.image }}-nvidia-iso-weekly"
811-
TITLE="Margine NVIDIA Linux ISO (weekly auto-refresh)"
812-
DESCRIPTION="Margine NVIDIA live ISO (Titanoboa), experimental — refreshed automatically every week; margine-nvidia-latest.iso is replaced in place, check SHA256SUMS for the current build. Bootable GNOME live session with the Anaconda installer. Bluefin DX + CachyOS signed kernel + NVIDIA driver + Margine deltas. Source: https://github.com/${{ github.repository }}"
811+
TITLE="Margine OS NVIDIA Linux ISO (weekly auto-refresh)"
812+
DESCRIPTION="Margine OS NVIDIA live ISO (Titanoboa), experimental: refreshed automatically every week; margine-nvidia-latest.iso is replaced in place, check SHA256SUMS for the current build. Bootable GNOME live session with the Anaconda installer. Bluefin DX + CachyOS signed kernel + NVIDIA driver + Margine deltas. Website: https://margine.dev. Source: https://github.com/${{ github.repository }}"
813813
fi
814814
SUBJECT="linux;fedora;bootc;bluefin;cachyos;margine"
815815
export IA_CONFIG_FILE=/tmp/ia.ini
@@ -888,8 +888,8 @@ jobs:
888888
OUTDIR="${{ steps.disk.outputs.outdir }}"
889889
DATE_TAG="${{ steps.disk.outputs.date_tag }}"
890890
ISO_NAME="${{ steps.disk.outputs.artifact_basename }}"
891-
HEADER="Margine ${DATE_TAG}"
892-
SUBHEAD="Margine — Bluefin DX + CachyOS signed kernel."
891+
HEADER="Margine OS ${DATE_TAG}"
892+
SUBHEAD="Margine OS: Bluefin DX + CachyOS signed kernel."
893893
TORRENT_URL="https://archive.org/download/${IDENTIFIER}/${IDENTIFIER}_archive.torrent"
894894
MIRROR_HTTP="https://archive.org/download/${IDENTIFIER}/${ISO_NAME}"
895895
cat > "$OUTDIR/index.html" <<HTML

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ stable release is cut.
88
## [Unreleased]
99

1010
### Changed (2026-07-11)
11+
- **The public product name is "Margine OS"** (fixed together with the
12+
DistroWatch submission). os-release NAME/PRETTY_NAME/VERSION/VARIANT now
13+
say "Margine OS" (GNOME About, hostnamectl, BLS boot entries), the About
14+
panel's Website link points at https://margine.dev (was GitHub), the
15+
Archive ISO titles read "Margine OS ... Linux ISO", and README leads with
16+
the full name. "Margine" stays as the short form in running text; the
17+
technical identifiers (VARIANT_ID=margine for countme, margine-* names,
18+
Archive identifiers, the image name) are deliberately unchanged. Naming
19+
policy recorded in docs/BRANDING.md.
1120
- **Reverse-DNS namespace moved to dev.margine.** The last identifiers
1221
derived from the old domain are gone: the ISO-builder GUI app id is now
1322
`dev.margine.IsoBuilder` (.desktop, D-Bus name, Justfile, DESIGN.md,

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div align="center">
22

3-
<img src="docs/branding/margine-logo-wide.png" alt="Margine" width="640">
3+
<img src="docs/branding/margine-logo-wide.png" alt="Margine OS" width="640">
44

5-
### An immutable Linux desktop distribution.
5+
### Margine OS: an immutable Linux desktop distribution.
66

77
Bomb-proof by design, fast on the CachyOS kernel, with a GNOME re-wired for
88
tiling, every codec and driver already in place, and a curated set of creator

‎build_files/10-os-identity/install.sh‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ log "Stamping os-release as Margine (canonical Fedora layout: /etc → /usr/lib
4545
# (Workstation/Server/Silverblue/Kinoite all set ID=fedora and a different
4646
# VARIANT_ID). We follow the same pattern:
4747
#
48-
# * NAME / PRETTY_NAME / VARIANT all say "Margine" — every UI surface that
48+
# * NAME / PRETTY_NAME / VARIANT all say "Margine OS" (the public product
49+
# name, decided 2026-07-11 with the DistroWatch submission; "Margine"
50+
# stays as the short form in running text) — every UI surface that
4951
# reads os-release (GNOME About panel, hostnamectl, neofetch, the
5052
# gdm/Plymouth themes) reads NAME or PRETTY_NAME, not ID.
5153
# * ID=fedora — so distro-tooling that does an exact lookup by ID-VERSION_ID
@@ -59,21 +61,21 @@ log "Stamping os-release as Margine (canonical Fedora layout: /etc → /usr/lib
5961
# margine-fedora-atomic now checks this instead of ID to identify a
6062
# Margine install.
6163
OS_RELEASE_CONTENT=$(cat <<EOF
62-
NAME="Margine"
63-
VERSION="${FEDORA_VER} (Margine)"
64+
NAME="Margine OS"
65+
VERSION="${FEDORA_VER} (Margine OS)"
6466
ID=fedora
6567
ID_LIKE=bluefin
6668
VERSION_ID=${FEDORA_VER}
6769
VERSION_CODENAME=""
6870
PLATFORM_ID="platform:f${FEDORA_VER}"
69-
PRETTY_NAME="Margine ${FEDORA_VER} (${BUILD_DATE})"
70-
VARIANT="Margine"
71+
PRETTY_NAME="Margine OS ${FEDORA_VER} (${BUILD_DATE})"
72+
VARIANT="Margine OS"
7173
VARIANT_ID=margine
7274
ANSI_COLOR="0;38;2;232;186;0"
7375
LOGO=margine-logo
7476
CPE_NAME="cpe:/o:daniel-g-carrasco:margine:${FEDORA_VER}"
75-
HOME_URL="https://github.com/daniel-g-carrasco/margine-image"
76-
DOCUMENTATION_URL="https://github.com/daniel-g-carrasco/margine-image"
77+
HOME_URL="https://margine.dev"
78+
DOCUMENTATION_URL="https://margine.dev/docs"
7779
SUPPORT_URL="https://github.com/daniel-g-carrasco/margine-image/issues"
7880
BUG_REPORT_URL="https://github.com/daniel-g-carrasco/margine-image/issues"
7981
DEFAULT_HOSTNAME="margine"

‎build_files/40-spec-scripts/scripts/validate-margine-system‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fi
6868

6969
# Expected values — canonical Margine state.
7070
# Keep in sync with declarations/margine-atomic.yaml and build.sh.
71-
EXPECTED_OS_NAME="Margine"
71+
EXPECTED_OS_NAME="Margine OS"
7272
# os-release(5): ID is the family (we use "fedora", same as Bluefin's own
7373
# upstream now does, so bootc-image-builder can find its distro definition);
7474
# VARIANT_ID is the specific spin within the family. Margine identifies as

‎docs/BRANDING.md‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,27 @@ renamed or deleted):
107107

108108
Fields that matter for branding:
109109

110+
**Naming policy (2026-07-11, fixed with the DistroWatch submission):** the
111+
public product name is **"Margine OS"**: titles, first mentions, About panel,
112+
directories and stores all use it. **"Margine"** alone is the accepted short
113+
form in running text after the first mention. Technical identifiers never
114+
carry the suffix and never change: `VARIANT_ID=margine` (countme keys on it),
115+
`margine-*` unit/script/icon names, `margine-live-iso-*` Archive identifiers,
116+
the `margine.dev` domain, the ghcr.io/`margine` image name.
117+
110118
| Key | Value | Consumed by |
111119
|---|---|---|
112-
| `NAME` | `Margine` | GNOME About title, many tools |
113-
| `PRETTY_NAME` | `Margine <ver> (<build-date>)` | login banners, `hostnamectl` |
114-
| `VERSION` | `<ver> (Margine)` | About |
115-
| `VARIANT` | `Margine` | About |
116-
| `VARIANT_ID` | `margine` | **the authoritative discriminator** (anaconda profile, scripts) |
120+
| `NAME` | `Margine OS` | GNOME About title, many tools |
121+
| `PRETTY_NAME` | `Margine OS <ver> (<build-date>)` | login banners, `hostnamectl`, BLS boot entries |
122+
| `VERSION` | `<ver> (Margine OS)` | About |
123+
| `VARIANT` | `Margine OS` | About |
124+
| `VARIANT_ID` | `margine` | **the authoritative discriminator** (anaconda profile, scripts, countme) — do not change |
117125
| `ID` | `fedora` | kept for bootc-image-builder / tooling compat — **do not change** |
118126
| `ID_LIKE` | `bluefin` | provenance |
119127
| `LOGO` | `margine-logo` | GNOME About logo (icon-theme lookup) |
120128
| `ANSI_COLOR` | `0;38;2;232;186;0` | terminal accent = **#E8BA00** (the Margine yellow) |
121-
| `HOME_URL` / `DOCUMENTATION_URL` / `SUPPORT_URL` / `BUG_REPORT_URL` | GitHub repos | About "Website", links |
129+
| `HOME_URL` / `DOCUMENTATION_URL` | `https://margine.dev` / `/docs` | About "Website", links |
130+
| `SUPPORT_URL` / `BUG_REPORT_URL` | GitHub issues | About links |
122131
| `DEFAULT_HOSTNAME` | `margine` | first-boot hostname |
123132

124133
**About panel extras** (`build_files/50-branding/install.sh`):

0 commit comments

Comments
 (0)