mirror of
https://github.com/kuhyx/testsAndMisc.git
synced 2026-11-20 15:12:19 +01:00
Some checks are pending
md-naming / markdown naming convention (push) Waiting to run
Pre-commit checks / pre-commit (${{ matrix.group }}) (mypy, mypy) (push) Waiting to run
Pre-commit checks / pre-commit (${{ matrix.group }}) (pylint, pylint) (push) Waiting to run
Pre-commit checks / pre-commit (${{ matrix.group }}) (rest, ) (push) Waiting to run
Pre-commit checks / pre-commit (${{ matrix.group }}) (shellcheck, shellcheck) (push) Waiting to run
repo-contract / repo contract (push) Waiting to run
Shell tests / shell-tests (push) Waiting to run
Shell tests / lib-tests (push) Waiting to run
Shell tests / arch-tests (push) Waiting to run
Disabling it left network-online.target empty, so reflector, periodic maintenance and nftables-drift raced the LAN/DNS and failed every boot. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
133 lines
4.2 KiB
Bash
Executable File
133 lines
4.2 KiB
Bash
Executable File
#!/bin/bash
|
|
# Journal, NetworkManager and media-organizer performance fixes.
|
|
#
|
|
# Sourced by fix_arch_performance.sh; split out to keep it under the 250-line cap.
|
|
# Sourced rather than run, so it inherits the caller's strict mode and
|
|
# the helper functions and variables defined above the source line.
|
|
|
|
# ===================================================================
|
|
# Fix 3: Journal vacuum + permanent size cap
|
|
# ===================================================================
|
|
fix_journal() {
|
|
local usage_line
|
|
usage_line=$(journalctl --disk-usage 2>/dev/null || true)
|
|
|
|
local needs_vacuum=false
|
|
# Optional space before the unit: journalctl prints "305.5M in the file
|
|
# system", with no separator, so requiring one made this dead code.
|
|
# Cap is 4G. 300M held about two days on kuhy's desktop: one Steam boot
|
|
# wrote 480k journal lines, and the evidence for a curfew failure two
|
|
# weeks earlier was already gone (2026-09-13). Only a journal past the
|
|
# cap gets vacuumed, so a healthy 2G journal is left alone.
|
|
if [[ $usage_line =~ ([0-9]+)\.?[0-9]*\ ?G ]] && ((BASH_REMATCH[1] >= 4)); then
|
|
needs_vacuum=true
|
|
fi
|
|
|
|
if [[ $needs_vacuum == "true" ]]; then
|
|
journalctl --vacuum-size=4G
|
|
else
|
|
log_ok "Journal is already under 4G."
|
|
fi
|
|
|
|
# Create permanent size cap via drop-in
|
|
local dropin_dir="${JOURNALD_CONF_DIR:-/etc/systemd/journald.conf.d}"
|
|
local dropin_file="$dropin_dir/size-limit.conf"
|
|
|
|
if [[ -f $dropin_file ]] && grep -q 'SystemMaxUse=4G' "$dropin_file"; then
|
|
log_ok "Journal size cap already configured."
|
|
else
|
|
mkdir -p "$dropin_dir"
|
|
cat >"$dropin_file" <<'JOURNALEOF'
|
|
[Journal]
|
|
SystemMaxUse=4G
|
|
JOURNALEOF
|
|
systemctl restart systemd-journald
|
|
fi
|
|
|
|
return 0
|
|
}
|
|
|
|
# ===================================================================
|
|
# Fix 4: Keep NetworkManager-wait-online enabled
|
|
# ===================================================================
|
|
# Keep NetworkManager-wait-online ENABLED. Disabling it once "saved ~6s" but
|
|
# left network-online.target with no dependencies: reflector, the periodic
|
|
# maintenance units and nftables-drift then ran before DNS/LAN existed and
|
|
# failed on every boot (2026-11-20). Only units ordered after
|
|
# network-online.target wait for it; the desktop does not.
|
|
fix_nm_wait_online() {
|
|
if systemctl is-enabled NetworkManager-wait-online.service >/dev/null 2>&1; then
|
|
log_ok "NetworkManager-wait-online already enabled — skipping."
|
|
return 0
|
|
fi
|
|
|
|
systemctl enable NetworkManager-wait-online.service
|
|
return 0
|
|
}
|
|
|
|
# ===================================================================
|
|
# Fix 5: media-organizer.service
|
|
# ===================================================================
|
|
fix_media_organizer() {
|
|
local service_file="${SYSTEMD_UNIT_DIR:-/etc/systemd/system}/media-organizer.service"
|
|
|
|
# Find the organize_downloads.sh script
|
|
local script_path=""
|
|
local candidates=(
|
|
"${ORGANIZE_SCRIPT_CANDIDATES:-/home/kuhy/src/testsAndMisc/linux_configuration/utils/organize_downloads.sh}"
|
|
"/home/kuhy/src/testsAndMisc/linux_configuration/utils/organize_downloads.sh"
|
|
)
|
|
for candidate in "${candidates[@]}"; do
|
|
if [[ -f $candidate ]]; then
|
|
script_path="$candidate"
|
|
break
|
|
fi
|
|
done
|
|
|
|
if [[ -z $script_path ]]; then
|
|
log_warn "organize_downloads.sh not found — skipping media-organizer fix."
|
|
return 0
|
|
fi
|
|
|
|
local target_user="${SUDO_USER:-kuhy}"
|
|
|
|
# Check if already correct
|
|
if [[ -f $service_file ]]; then
|
|
if grep -q "User=$target_user" "$service_file" &&
|
|
grep -q "ExecStart=$script_path" "$service_file"; then
|
|
log_ok "media-organizer.service is already correctly configured — skipping."
|
|
return 0
|
|
fi
|
|
fi
|
|
|
|
systemctl stop media-organizer.service 2>/dev/null || true
|
|
|
|
cat >"$service_file" <<EOF
|
|
[Unit]
|
|
Description=Media File Organizer
|
|
After=graphical-session.target
|
|
Wants=graphical-session.target
|
|
|
|
[Service]
|
|
Type=oneshot
|
|
User=$target_user
|
|
Group=$target_user
|
|
ExecStart=$script_path
|
|
StandardOutput=journal
|
|
StandardError=journal
|
|
RemainAfterExit=no
|
|
|
|
[Install]
|
|
WantedBy=multi-user.target
|
|
EOF
|
|
|
|
systemctl daemon-reload
|
|
systemctl reset-failed media-organizer.service 2>/dev/null || true
|
|
systemctl enable media-organizer.service
|
|
return 0
|
|
}
|
|
|
|
# ===================================================================
|
|
# Apply all fixes
|
|
# ===================================================================
|