iso: audit-sweep UID, bakery update, lockfile, welcome, autostart
Resolve MAIN_USER after deleting liveuser so Snapper and skel target the installed account. Wrap bakery update with sudo -n/pkexec for /usr/local. Pin bakery and bread-theme 0.7.4; require bread-emit and bread-module-host. Make Calamares internet check non-blocking against breadway.dev. Autostart breadlock listen. Smoke avahi-daemon.socket to match post-install.
This commit is contained in:
parent
b270d64adc
commit
df2e1310bb
8 changed files with 44 additions and 28 deletions
|
|
@ -3,9 +3,19 @@ showSupportUrl: false
|
||||||
showKnownIssuesUrl: false
|
showKnownIssuesUrl: false
|
||||||
showReleaseNotesUrl: false
|
showReleaseNotesUrl: false
|
||||||
|
|
||||||
|
# 3.4.2 schema: `check` is shown; only `required` blocks Next. Internet is
|
||||||
|
# informational so offline installs proceed. Do not probe archlinux.org.
|
||||||
requirements:
|
requirements:
|
||||||
requiredStorage: 20
|
requiredStorage: 20
|
||||||
requiredRam: 2.0
|
requiredRam: 2.0
|
||||||
checkInternet: true
|
internetCheckUrl: "https://breadway.dev"
|
||||||
checkPower: true
|
check:
|
||||||
internetCheckUrl: "https://archlinux.org"
|
- storage
|
||||||
|
- ram
|
||||||
|
- power
|
||||||
|
- internet
|
||||||
|
- root
|
||||||
|
required:
|
||||||
|
- storage
|
||||||
|
- ram
|
||||||
|
- root
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,6 @@
|
||||||
# Best-effort: do NOT use `set -e`; a single failure here must not abort the rest.
|
# Best-effort: do NOT use `set -e`; a single failure here must not abort the rest.
|
||||||
set -uo pipefail
|
set -uo pipefail
|
||||||
|
|
||||||
MAIN_USER="$(getent passwd 1000 | cut -d: -f1 || true)"
|
|
||||||
|
|
||||||
# Whether Calamares encrypted the root partition (LUKS) — checked once here,
|
# Whether Calamares encrypted the root partition (LUKS) — checked once here,
|
||||||
# used below to conditionally wire mkinitcpio's encrypt hook and GRUB's
|
# used below to conditionally wire mkinitcpio's encrypt hook and GRUB's
|
||||||
# cryptodisk support. `lsblk TYPE` reports "crypt" for a cryptsetup-opened
|
# cryptodisk support. `lsblk TYPE` reports "crypt" for a cryptsetup-opened
|
||||||
|
|
@ -33,6 +31,14 @@ rm -f /usr/local/bin/bos-live-setup /usr/local/bin/bos-launch-calamares
|
||||||
rm -f /etc/sudoers.d/99-bos-live
|
rm -f /etc/sudoers.d/99-bos-live
|
||||||
userdel -r liveuser 2>/dev/null || true
|
userdel -r liveuser 2>/dev/null || true
|
||||||
|
|
||||||
|
# Live ISO creates liveuser as UID 1000; Calamares then creates the real
|
||||||
|
# account as 1001. Capture AFTER userdel so Snapper ALLOW_USERS and skel
|
||||||
|
# copy the installed user, not the deleted live account.
|
||||||
|
MAIN_USER="$(getent passwd 1000 | cut -d: -f1 || true)"
|
||||||
|
if [[ -z "$MAIN_USER" || "$MAIN_USER" == "liveuser" ]]; then
|
||||||
|
MAIN_USER="$(getent passwd | awk -F: '$3 >= 1000 && $3 < 60000 && $1 != "liveuser" { print $1; exit }')"
|
||||||
|
fi
|
||||||
|
|
||||||
# unpackfs copies the entire live squashfs onto the target. Remove live-only
|
# unpackfs copies the entire live squashfs onto the target. Remove live-only
|
||||||
# packages (Calamares + archiso boot chain + memtest/EFI-shell payloads) so
|
# packages (Calamares + archiso boot chain + memtest/EFI-shell payloads) so
|
||||||
# they do not stay on disk forever. pacman -Rs (not -Rns) keeps /etc configs
|
# they do not stay on disk forever. pacman -Rs (not -Rns) keeps /etc configs
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
{ "command": "breadhelp --autostart", "label": "BOS Help (first-run onboarding)", "enabled": true },
|
{ "command": "breadhelp --autostart", "label": "BOS Help (first-run onboarding)", "enabled": true },
|
||||||
{ "command": "bash -c 'command -v breadpaper >/dev/null && exec breadpaper listen'", "label": "Wallpaper command bus (breadpaper listen)", "enabled": true },
|
{ "command": "bash -c 'command -v breadpaper >/dev/null && exec breadpaper listen'", "label": "Wallpaper command bus (breadpaper listen)", "enabled": true },
|
||||||
{ "command": "bash -c 'command -v breadshot >/dev/null && exec breadshot listen'", "label": "Screenshot command bus (breadshot listen)", "enabled": true },
|
{ "command": "bash -c 'command -v breadshot >/dev/null && exec breadshot listen'", "label": "Screenshot command bus (breadshot listen)", "enabled": true },
|
||||||
|
{ "command": "bash -c 'command -v breadlock >/dev/null && exec breadlock listen'", "label": "Lock command bus (breadlock listen)", "enabled": true },
|
||||||
{ "command": "bash -c 'command -v breadbox >/dev/null && exec breadbox listen'", "label": "Launcher command bus (breadbox listen)", "enabled": true },
|
{ "command": "bash -c 'command -v breadbox >/dev/null && exec breadbox listen'", "label": "Launcher command bus (breadbox listen)", "enabled": true },
|
||||||
{ "command": "bash -c 'command -v breadhelp >/dev/null && exec breadhelp listen'", "label": "Help command bus (breadhelp listen)", "enabled": true },
|
{ "command": "bash -c 'command -v breadhelp >/dev/null && exec breadhelp listen'", "label": "Help command bus (breadhelp listen)", "enabled": true },
|
||||||
{ "command": "bash -c 'command -v breadsearch >/dev/null && exec breadsearch listen'", "label": "Search command bus (breadsearch listen)", "enabled": true },
|
{ "command": "bash -c 'command -v breadsearch >/dev/null && exec breadsearch listen'", "label": "Search command bus (breadsearch listen)", "enabled": true },
|
||||||
|
|
|
||||||
|
|
@ -137,9 +137,9 @@ hl.on("hyprland.start", function()
|
||||||
-- Clipboard history is breadclipd, a bakery-managed systemd --user
|
-- Clipboard history is breadclipd, a bakery-managed systemd --user
|
||||||
-- service (auto-started from /usr/lib/systemd/user — see
|
-- service (auto-started from /usr/lib/systemd/user — see
|
||||||
-- build-local.sh's service bake) rather than an exec-once here.
|
-- build-local.sh's service bake) rather than an exec-once here.
|
||||||
-- Prefer bread-polkit when bakery has published it; otherwise the
|
-- Prefer bread-polkit if it is on PATH (not baked; lockfile does not
|
||||||
-- ISO's polkit-gnome agent. command -v so a missing binary does not
|
-- ship it). Otherwise the ISO's polkit-gnome agent. command -v so a
|
||||||
-- leave the session without an auth agent.
|
-- missing binary does not leave the session without an auth agent.
|
||||||
"sh -c 'if command -v bread-polkit >/dev/null; then exec bread-polkit; else exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1; fi'",
|
"sh -c 'if command -v bread-polkit >/dev/null; then exec bread-polkit; else exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1; fi'",
|
||||||
"awww-daemon",
|
"awww-daemon",
|
||||||
-- Set the default wallpaper once the daemon is up (retry until ready).
|
-- Set the default wallpaper once the daemon is up (retry until ready).
|
||||||
|
|
@ -194,6 +194,7 @@ hl.on("hyprland.start", function()
|
||||||
"breadhelp --autostart",
|
"breadhelp --autostart",
|
||||||
"bash -c 'command -v breadpaper >/dev/null && exec breadpaper listen'",
|
"bash -c 'command -v breadpaper >/dev/null && exec breadpaper listen'",
|
||||||
"bash -c 'command -v breadshot >/dev/null && exec breadshot listen'",
|
"bash -c 'command -v breadshot >/dev/null && exec breadshot listen'",
|
||||||
|
"bash -c 'command -v breadlock >/dev/null && exec breadlock listen'",
|
||||||
"bash -c 'command -v breadbox >/dev/null && exec breadbox listen'",
|
"bash -c 'command -v breadbox >/dev/null && exec breadbox listen'",
|
||||||
"bash -c 'command -v breadhelp >/dev/null && exec breadhelp listen'",
|
"bash -c 'command -v breadhelp >/dev/null && exec breadhelp listen'",
|
||||||
"bash -c 'command -v breadsearch >/dev/null && exec breadsearch listen'",
|
"bash -c 'command -v breadsearch >/dev/null && exec breadsearch listen'",
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ local DEFAULT_EXTRA = {
|
||||||
{ command = "breadhelp --autostart", enabled = true },
|
{ command = "breadhelp --autostart", enabled = true },
|
||||||
{ command = "bash -c 'command -v breadpaper >/dev/null && exec breadpaper listen'", enabled = true },
|
{ command = "bash -c 'command -v breadpaper >/dev/null && exec breadpaper listen'", enabled = true },
|
||||||
{ command = "bash -c 'command -v breadshot >/dev/null && exec breadshot listen'", enabled = true },
|
{ command = "bash -c 'command -v breadshot >/dev/null && exec breadshot listen'", enabled = true },
|
||||||
|
{ command = "bash -c 'command -v breadlock >/dev/null && exec breadlock listen'", enabled = true },
|
||||||
{ command = "bash -c 'command -v breadbox >/dev/null && exec breadbox listen'", enabled = true },
|
{ command = "bash -c 'command -v breadbox >/dev/null && exec breadbox listen'", enabled = true },
|
||||||
{ command = "bash -c 'command -v breadhelp >/dev/null && exec breadhelp listen'", enabled = true },
|
{ command = "bash -c 'command -v breadhelp >/dev/null && exec breadhelp listen'", enabled = true },
|
||||||
{ command = "bash -c 'command -v breadsearch >/dev/null && exec breadsearch listen'", enabled = true },
|
{ command = "bash -c 'command -v breadsearch >/dev/null && exec breadsearch listen'", enabled = true },
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,15 @@ fi
|
||||||
echo
|
echo
|
||||||
bold "==> Bread ecosystem (bakery update --all)"
|
bold "==> Bread ecosystem (bakery update --all)"
|
||||||
if command -v bakery >/dev/null; then
|
if command -v bakery >/dev/null; then
|
||||||
bakery update --all || echo "WARN: bakery update failed"
|
# /usr/local is root-owned. Never run bakery as the user against it;
|
||||||
|
# bakery itself also tries sudo -n then pkexec for privileged writes.
|
||||||
|
if sudo -n true >/dev/null 2>&1; then
|
||||||
|
sudo -n bakery update --all || echo "WARN: bakery update failed"
|
||||||
|
elif command -v pkexec >/dev/null; then
|
||||||
|
pkexec bakery update --all || echo "WARN: bakery update failed"
|
||||||
|
else
|
||||||
|
echo "WARN: bakery update needs sudo -n or pkexec for /usr/local"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "bakery not found; skipping"
|
echo "bakery not found; skipping"
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,8 @@
|
||||||
# build-local.sh and CI (scripts/ci-stage-bakery.py) read this file. A missing
|
# build-local.sh and CI (scripts/ci-stage-bakery.py) read this file. A missing
|
||||||
# *required* binary fails the bake: a hollow ISO is worse than a failed build.
|
# *required* binary fails the bake: a hollow ISO is worse than a failed build.
|
||||||
# optional_bins are baked when the verified stable index publishes them, and
|
# optional_bins are baked when the verified stable index publishes them, and
|
||||||
# skipped with a warning when it does not (today: bread 0.8.0 has no
|
# skipped with a warning when it does not. bread 0.8.0 ships bread-emit and
|
||||||
# bread-emit / bread-module-host).
|
# bread-module-host, so those are required_bins.
|
||||||
#
|
#
|
||||||
# A flat `bins` list is still accepted and treated as required_bins.
|
# A flat `bins` list is still accepted and treated as required_bins.
|
||||||
#
|
#
|
||||||
|
|
@ -23,6 +23,8 @@ required_bins = [
|
||||||
"bakery",
|
"bakery",
|
||||||
"bread",
|
"bread",
|
||||||
"breadd",
|
"breadd",
|
||||||
|
"bread-emit",
|
||||||
|
"bread-module-host",
|
||||||
"breadman",
|
"breadman",
|
||||||
"breadbar",
|
"breadbar",
|
||||||
"breadbox",
|
"breadbox",
|
||||||
|
|
@ -41,19 +43,13 @@ required_bins = [
|
||||||
"breadhelp",
|
"breadhelp",
|
||||||
]
|
]
|
||||||
|
|
||||||
# Bake if the verified index publishes them; do not fail the ISO if absent.
|
|
||||||
optional_bins = [
|
|
||||||
"bread-emit",
|
|
||||||
"bread-module-host",
|
|
||||||
]
|
|
||||||
|
|
||||||
# Package name → version. Must exist at dl.breadway.dev/<pkg>/<ver>/ and
|
# Package name → version. Must exist at dl.breadway.dev/<pkg>/<ver>/ and
|
||||||
# should match the signed index so CI can verify sha256.
|
# should match the signed index so CI can verify sha256.
|
||||||
# [[pin]] { package, version } is accepted as well and merged (conflict = bake error).
|
# [[pin]] { package, version } is accepted as well and merged (conflict = bake error).
|
||||||
[versions]
|
[versions]
|
||||||
bakery = "0.7.3"
|
bakery = "0.7.4"
|
||||||
bread = "0.8.0"
|
bread = "0.8.0"
|
||||||
bread-theme = "0.7.3"
|
bread-theme = "0.7.4"
|
||||||
breadbar = "0.3.2"
|
breadbar = "0.3.2"
|
||||||
breadbox = "0.3.2"
|
breadbox = "0.3.2"
|
||||||
breadcrumbs = "2.1.8"
|
breadcrumbs = "2.1.8"
|
||||||
|
|
|
||||||
|
|
@ -40,22 +40,15 @@ check "grub-btrfs present" "pacman -Qq grub-btrfs"
|
||||||
|
|
||||||
echo "== enabled system services =="
|
echo "== enabled system services =="
|
||||||
for unit in NetworkManager.service greetd.service bluetooth.service tlp.service \
|
for unit in NetworkManager.service greetd.service bluetooth.service tlp.service \
|
||||||
cups.socket avahi-daemon.service ufw.service systemd-timesyncd.service; do
|
cups.socket avahi-daemon.socket ufw.service systemd-timesyncd.service; do
|
||||||
check "$unit enabled" "systemctl is-enabled $unit"
|
check "$unit enabled" "systemctl is-enabled $unit"
|
||||||
done
|
done
|
||||||
check "graphical.target is default" "[ \"\$(systemctl get-default)\" = graphical.target ]"
|
check "graphical.target is default" "[ \"\$(systemctl get-default)\" = graphical.target ]"
|
||||||
|
|
||||||
echo "== bread ecosystem on PATH =="
|
echo "== bread ecosystem on PATH =="
|
||||||
for bin in bakery bread breadd breadbar breadbox breadbox-sync breadcrumbs breadpad breadman; do
|
for bin in bakery bread breadd bread-emit bread-module-host breadbar breadbox breadbox-sync breadcrumbs breadpad breadman; do
|
||||||
check "$bin found" "command -v $bin"
|
check "$bin found" "command -v $bin"
|
||||||
done
|
done
|
||||||
for bin in bread-emit bread-module-host; do
|
|
||||||
if command -v "$bin" >/dev/null 2>&1; then
|
|
||||||
ok "$bin found"
|
|
||||||
else
|
|
||||||
note "$bin not on PATH (optional until stable bread ships it)"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
echo "== bos-settings =="
|
echo "== bos-settings =="
|
||||||
check "bos-settings installed" "command -v bos-settings"
|
check "bos-settings installed" "command -v bos-settings"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue