From e7965cb1488243f7941f95781fcef30534e971b2 Mon Sep 17 00:00:00 2001 From: vasilito Date: Wed, 29 Jul 2026 11:26:42 +0900 Subject: [PATCH] =?UTF-8?q?configs:=20drop=20hardcoded=20filesystem=5Fsize?= =?UTF-8?q?=20=E2=80=94=20installer=20now=20computes=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mini/full/bare no longer pin filesystem_size; the installer sizes the RedoxFS image from the actual package set (redox_installer::compute_filesystem_size_mb, installer fork 89e1c67). Removes the magic numbers (mini 512/2048, full 4096, bare 192) that had to be hand-tuned as packages changed. Bumps the installer submodule pointer. Co-Authored-By: Claude Opus 4.8 (1M context) --- config/redbear-bare.toml | 5 +++-- config/redbear-full.toml | 3 ++- config/redbear-mini.toml | 12 ++++-------- local/sources/installer | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/config/redbear-bare.toml b/config/redbear-bare.toml index 87d5ea39d8..727c8212f3 100644 --- a/config/redbear-bare.toml +++ b/config/redbear-bare.toml @@ -20,8 +20,9 @@ include = ["minimal.toml"] # 192 MiB leaves ~30% headroom over the 153 MiB of installed content # (zsh, base, base-initfs, kernel, relibc, userutils, libgcc, libstdcxx, # coreutils, extrautils, ca-certificates, kibi, netdb, netutils, pkgutils, -# uutils). Anything below 160 MiB triggers ENOSPC during installer commit. -filesystem_size = 192 +# uutils). filesystem_size is auto-computed by the installer from the package +# set (see redox_installer::compute_filesystem_size_mb); the computed size +# includes a free-space margin so it clears the historical ~160 MiB ENOSPC floor. # Trim down packages beyond what minimal.toml includes. # minimal.toml includes ca-certificates, coreutils, extrautils, zsh, pkgutils, kibi. diff --git a/config/redbear-full.toml b/config/redbear-full.toml index 2e7c6e994a..652356deac 100644 --- a/config/redbear-full.toml +++ b/config/redbear-full.toml @@ -10,7 +10,8 @@ include = ["redbear-mini.toml"] [general] -filesystem_size = 4096 +# filesystem_size auto-computed by the installer from the package set +# (see redox_installer::compute_filesystem_size_mb). Set explicitly to override. # Package groups — meta-package definitions for logical grouping of the # desktop stack. The installer resolves all group references before diff --git a/config/redbear-mini.toml b/config/redbear-mini.toml index 77b2479117..c9d91b7c01 100644 --- a/config/redbear-mini.toml +++ b/config/redbear-mini.toml @@ -10,14 +10,10 @@ include = ["minimal.toml", "redbear-legacy-base.toml", "redbear-netctl.toml", "redbear-device-services.toml", "redbear-boot-stages.toml"] [general] -# The mini package set (base + full driver/daemon set, brush/bash/zsh, coreutils, -# console net/diagnostic tools, iwlwifi/bluetooth firmware) is ~350 MB *compressed* -# pkgars; the RedoxFS image holds the uncompressed extraction plus live writable -# headroom, which overflows a 512 MB image (installer aborts with os error 28, -# "No space left on device"). The installer does not content-size the filesystem — -# this value is the literal image size — so it must fit the package set. 2048 MB -# leaves comfortable headroom for a text-only live/recovery target. -filesystem_size = 2048 +# filesystem_size is intentionally omitted: the installer computes the RedoxFS +# image size from the actual package set (per-file block accounting over the +# transitive package closure + overhead + free margin). Set it explicitly here +# only to override that computation. See redox_installer::compute_filesystem_size_mb. [users.messagebus] uid = 100 diff --git a/local/sources/installer b/local/sources/installer index bb243fb3e5..89e1c67006 160000 --- a/local/sources/installer +++ b/local/sources/installer @@ -1 +1 @@ -Subproject commit bb243fb3e56717b7d953236633edfdbe90892e1d +Subproject commit 89e1c6700608e4dd86827a10383ec381954d02c4