Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Bluefin's `base.toml` and is now edited by hand as Dakota parity work lands.
| | count |
| --- | --- |
| Base manifest installed | **57** |
| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 337 |
| Utah additions (GNOME 51, base-image parity, device firmware, desktop services) | 339 |
| Genuinely unavailable | **9** |

## Known gaps
Expand Down
2 changes: 1 addition & 1 deletion baselines/GAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Generated by `scripts/image-baseline.py gap`; do not edit.
| jpeg | waived | 6 commands | Library utility: cjpeg, djpeg and jpegtran (libjpeg-turbo-utils) |
| json-glib | waived | 2 commands | Developer toolchain (#1263) |
| kanata | planned | 1 command, 1 system unit | #1297 installs kanata from the factory in place of input-remapper (#1222) |
| kmscon | planned | 2 commands, 2 system units | kmsconvt@ on the VTs with getty@ disabled, as GNOME OS and Dakota; needs the factory's kmscon (and a libtsm recipe) (#1237) |
| kmscon | planned | 2 commands, 2 system units | Installed from the factory (kmscon, kmscon-pango); kmsconvt@ on the VTs with getty@ disabled, as GNOME OS and Dakota; closes on the next baseline (#1237) |
| krb5 | waived | 16 commands | Kerberos KDC and admin server (krb5-server); Utah is a client (krb5-workstation) |
| kyotocabinet | waived | 17 commands | Developer toolchain (#1263): Kyoto Cabinet test and admin tools |
| ladspa-sdk | waived | 3 commands | Library utility: LADSPA example plugin tools |
Expand Down
2 changes: 1 addition & 1 deletion baselines/triage.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spice = { status = "planned", area = "vm-guests", issue = "#1232", reason = "spi
open-vm-tools = { status = "planned", area = "vm-guests", issue = "#1232", reason = "#1309 installs it" }
hyperv-daemons = { status = "planned", area = "vm-guests", issue = "#1232", reason = "#1309 installs it" }
"/usr/lib/systemd/system/global-preset-all.service" = { status = "planned", area = "system-daemons", issue = "#1233", reason = "GNOME OS first-boot preset-all; part of Dakota's enable-by-default service policy" }
kmscon = { status = "planned", area = "system-daemons", issue = "#1237", reason = "kmsconvt@ on the VTs with getty@ disabled, as GNOME OS and Dakota; needs the factory's kmscon (and a libtsm recipe)" }
kmscon = { status = "planned", area = "system-daemons", issue = "#1237", reason = "Installed from the factory (kmscon, kmscon-pango); kmsconvt@ on the VTs with getty@ disabled, as GNOME OS and Dakota; closes on the next baseline" }
bluefin = { status = "planned", area = "system-daemons", issue = "#1236", reason = "Dakota's own units: swapfile-init (#1224) and migrate-var-home-passwd (#1234) arrive with #1309, wallpaper-month (#1266), remove-installer" }
"/usr/lib/systemd/system/ublue-wallpaper-month.service" = { status = "planned", area = "desktop-defaults", issue = "#1266", reason = "Ships in system_files with bluefin-wallpaper-month, as Dakota; the default wallpaper stays common's" }
"/usr/bin/ublue-firstboot-date" = { status = "planned", area = "system-daemons", issue = "#1265", reason = "Ships with dakota-config-firstboot-date; records only once timesyncd replaces chrony (#1228)" }
Expand Down
12 changes: 12 additions & 0 deletions contracts/bluefin-desktop.toml
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,13 @@ files = [
"/usr/bin/oo7-cli",
"/etc/pam.d/passwd",
"/usr/share/xdg-desktop-portal/gnome-portals.conf",
# kmscon on the VTs, as gnome-build-meta gnomeos-deps/kmscon.bst ships it
# (#1237): Adwaita Mono font config and gdm's hand-over of tty1.
"/usr/bin/kmscon",
"/usr/lib/systemd/system/kmsconvt@.service",
"/usr/lib64/kmscon/mod-pango.so",
"/etc/kmscon/kmscon.conf",
"/usr/lib/systemd/system/gdm.service.d/kmscon.conf",
# Dakota's shell defaults (projectbluefin/dakota elements/bluefin/common.bst).
"/etc/profile.d/bluefin-shell-defaults.sh",
# Common's Red Hat signature policy uses the unsuffixed key path. The pinned
Expand Down Expand Up @@ -610,6 +617,8 @@ enabled = [
# enable` is a no-op (the nvidia/gaming image builds failed on it).
"accounts-daemon.service",
"ModemManager.service",
# kmscon on the VTs in place of getty@ (#1237).
"kmsconvt@.service",
"power-profiles-daemon.service",
# Dakota's effective service state (#1233): on by enable-by-default
# (98-utah-enable-default.preset), measured on a booted Dakota.
Expand Down Expand Up @@ -745,6 +754,9 @@ disabled = [
"sysstat-rotate.timer",
# Key remapping is opt-in, as on Dakota (#1222).
"kanata.service",
# getty@ and kmscon.service are off; kmsconvt@ owns the VTs (#1237).
"getty@.service",
"kmscon.service",
# Utah-only units Dakota does not run (#1233).
"multipathd.service",
"lm_sensors.service",
Expand Down
20 changes: 18 additions & 2 deletions docs/skills/desktop-contract/references/dakota-services.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ order of their names; the first line that matches a unit wins.
|---|---|---|
| `00-`…`03-*.preset` | brew, uupd, common | vendor enables |
| `80-hummingbird.preset` | Hummingbird | `disable dnf-makecache.timer`, `enable bootloader-update.service` |
| `85-utah-desktop.preset` | Utah | overrides the base's 80/90 files: `enable systemd-boot-update.service`; `disable` sshd, multipathd, lm_sensors, Dakota's iSCSI set, the serial getty, rpm-ostree and bootc-fetch-apply-updates |
| `85-utah-desktop.preset` | Utah | overrides the base's 80/90 files: `enable systemd-boot-update.service`; `disable` sshd, multipathd, lm_sensors, Dakota's iSCSI set, the serial getty, `getty@` (kmscon owns the VTs), rpm-ostree and bootc-fetch-apply-updates |
| `90-default.preset`, `90-systemd.preset` | Hummingbird | Fedora's server enables and disables, upstream systemd's list |
| `98-utah-enable-default.preset` | Utah | GNOME OS's and Dakota's disables, Utah's own disables, then `enable *` |
| `99-default-disable.preset` | Hummingbird | `disable *`; never reached |
Expand All @@ -33,7 +33,8 @@ are never enabled by a preset.
and wait-online, the sshd socket and key helpers, the `wpa_supplicant@` templates.
- Dakota's element presets: `50-sysupdate` (plus `systemd-sysupdate.*`; Utah
updates through bootc and uupd), `80-kanata`, `80-kmscon` (the service; its
`getty@.service` line ships with kmscon), `80-libvirt`, `80-nethogs`,
`getty@.service` line is in 85, which outranks Hummingbird's 90-systemd),
`80-libvirt`, `80-nethogs`,
`80-nfs-client` (server side), `80-pam-pkcs11`, `80-pcrlock` (verbatim
order: machine-id and Secure Boot authority locked), `80-rpcbind`,
`80-sysstat` (sar/iostat on demand; `systemctl enable --now sysstat.service`).
Expand Down Expand Up @@ -161,6 +162,21 @@ and running `systemctl enable --now kanata`. `ydotool` brings Dakota's
`80-ydotool.rules` (uinput to `input`, uaccess) and the `uinput` modules-load
drop-in (utah-packages#1134).

### Console (#1237)

The VT consoles are kmscon, as on GNOME OS and Dakota, set up as
gnome-build-meta `gnomeos-deps/kmscon.bst` does. The factory's `kmscon` ships
no preset, so `98-utah-enable-default.preset` disables `kmscon.service` and
`85-utah-desktop.preset` disables `getty@.service` ahead of Hummingbird's
`90-systemd.preset`. `kmsconvt@.service` is on through enable-by-default: it
has `DefaultInstance=tty1` and `Alias=autovt@.service`, so logind spawns it on
every VT, and its `OnFailure=getty@%i.service` keeps a login if kmscon fails.
`/etc/kmscon/kmscon.conf` sets `font-name=Adwaita Mono` (drawn by
`kmscon-pango`), and `gdm.service.d/kmscon.conf` sets
`Conflicts=`/`After=kmsconvt@tty1.service` so GDM takes tty1 over. The
serial `serial-getty@ttyS0` mask is unchanged. The contract asserts the files,
`kmsconvt@.service` enabled, and `getty@`/`kmscon.service` disabled.

### User units

The user side keeps a catch-all disable, as GNOME OS does (gnome-build-meta
Expand Down
2 changes: 1 addition & 1 deletion docs/skills/package-contract.md
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ describe the same image as its `surface.tsv`; after a refresh,
[remove resolved triage entries](package-contract/references/factory-consumption.md#closing-baseline-gaps).

Current counts, per the README "Parity with Dakota" section: 57 base manifest
packages installed, 337 Utah additions (GNOME 51, base-image parity, device
packages installed, 339 Utah additions (GNOME 51, base-image parity, device
firmware, desktop services), 9 genuinely unavailable. After changing a manifest,
run `python3 scripts/generate-site-data.py`, then
`python3 scripts/check-doc-counts.py --write` to refresh both documents.
Expand Down
8 changes: 8 additions & 0 deletions packages/utah.toml
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,12 @@ packages = [
"pam_oo7",
"oo7-portal",
"oo7-cli",
# kmscon on the VTs, as gnome-build-meta gnomeos-deps/kmscon.bst builds
# it (#1237): the pango renderer draws kmscon.conf's Adwaita Mono, which
# base.toml's adwaita-fonts-all supplies. Units: 85-utah-desktop.preset;
# kmscon.conf and the gdm drop-in: system_files.
"kmscon",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still not installable at this head: the contract job (head ec7f9593) fails in just check-repos with No match for argument: kmscon / kmscon-pango. #1237 is not delivered until the factory publishes kmscon (utah-packages#1147) plus a libtsm recipe, and the pinned utah-packages digest is bumped. There is no in-file fix. Re-push after that bump.

"kmscon-pango",
# Network file systems and Windows domain clients (the NFS family follows
# in the second-wave block below).
"cifs-utils",
Expand Down Expand Up @@ -1047,6 +1053,8 @@ parity = [
"pam_oo7",
"oo7-portal",
"oo7-cli",
"kmscon",
"kmscon-pango",
"cifs-utils",
"rpcbind",
"autofs",
Expand Down
4 changes: 3 additions & 1 deletion site/data/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@
"iw",
"kanata",
"keyutils",
"kmscon",
"kmscon-pango",
"krb5-workstation",
"langpacks-en",
"langpacks-fonts-en",
Expand Down Expand Up @@ -451,7 +453,7 @@
}
],
"totals": {
"installed": 394,
"installed": 396,
"unavailable": 9
},
"unavailable": [
Expand Down
1 change: 1 addition & 0 deletions system_files/shared/etc/kmscon/kmscon.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
font-name=Adwaita Mono
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ disable sshd.service
# instantiate the serial login on a desktop box. configure-services.sh masks
# the unit as well. See #103.
disable serial-getty@ttyS0.service
# kmscon draws the VT consoles, as on GNOME OS and Dakota (#1237):
# gnome-build-meta files/kmscon/80-kmscon.preset disables kmscon.service and
# getty@.service. The factory's kmscon ships no preset, and Hummingbird's
# 90-systemd.preset enables getty@, so this file turns it off (98 handles
# kmscon.service); kmsconvt@ is on through enable-by-default.
# kmsconvt@.service has DefaultInstance=tty1 and Alias=autovt@.service, so
# logind spawns it on every VT; it falls back to getty@ if kmscon fails.
disable getty@.service
# Image updates go through uupd and bootc; configure-services.sh masks the
# bootc timer too.
disable rpm-ostree.service
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Unit]
Conflicts=kmsconvt@tty1.service
After=kmsconvt@tty1.service
Loading