iso: fix packages.x86_64 (no inline comments; gstreamer-vaapi -> gst-plugin-va)
Inline comments after a package name broke kitty/flatpak (became invalid names with trailing whitespace). gstreamer-vaapi was removed from Arch. calamares is AUR-only -> commented pending a [tanin] rebuild decision. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
+43
@@ -0,0 +1,43 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
script_cmdline() {
|
||||
local param
|
||||
for param in $(</proc/cmdline); do
|
||||
case "${param}" in
|
||||
script=*)
|
||||
echo "${param#*=}"
|
||||
return 0
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
automated_script() {
|
||||
local script rt
|
||||
script="$(script_cmdline)"
|
||||
if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then
|
||||
if [[ "${script}" =~ ^((http|https|ftp|tftp)://) ]]; then
|
||||
printf '%s: downloading %s\n' "$0" "${script}"
|
||||
# there's no synchronization for network availability before executing this script; to ensure the network
|
||||
# is online, we use a transient systemd service that depends on network-online.target to download the
|
||||
# script rather than manually polling the target
|
||||
systemd-run --pty --quiet -p Wants=network-online.target -p After=network-online.target \
|
||||
curl "${script}" --location --retry-connrefused --retry 10 --fail -s -o /tmp/startup_script
|
||||
rt=$?
|
||||
else
|
||||
cp "${script}" /tmp/startup_script
|
||||
rt=$?
|
||||
fi
|
||||
if [[ ${rt} -eq 0 ]]; then
|
||||
chmod +x /tmp/startup_script
|
||||
printf '%s: executing automated script\n' "$0"
|
||||
# note that script is executed when other services (like pacman-init) may be still in progress, please
|
||||
# synchronize to "systemctl is-system-running --wait" when your script depends on other services
|
||||
/tmp/startup_script
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
if [[ $(tty) == "/dev/tty1" ]]; then
|
||||
automated_script
|
||||
fi
|
||||
@@ -0,0 +1,6 @@
|
||||
# Live ISO: on the first console (tty1), launch the TANINUX installer.
|
||||
# (On an installed system this file isn't present — Calamares' shellprocess
|
||||
# strips the live-only bits from the target.)
|
||||
if [[ "$(tty)" == /dev/tty1 ]] && [[ -z "${WAYLAND_DISPLAY:-}" ]] && ! pgrep -x cage >/dev/null 2>&1; then
|
||||
exec tanin-installer
|
||||
fi
|
||||
@@ -0,0 +1,4 @@
|
||||
disable-ccid
|
||||
disable-pinpad
|
||||
pcsc-driver /usr/lib/libpcsclite.so
|
||||
pcsc-shared
|
||||
@@ -0,0 +1,6 @@
|
||||
# fix for screen readers
|
||||
if grep -Fqa 'accessibility=' /proc/cmdline &> /dev/null; then
|
||||
setopt SINGLE_LINE_ZLE
|
||||
fi
|
||||
|
||||
~/.automated_script.sh
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
#!/usr/bin/env bash
|
||||
# Runs once inside the airootfs chroot during mkarchiso.
|
||||
set -e -u
|
||||
|
||||
# --- locale ---
|
||||
sed -i 's/#\(en_US\.UTF-8 UTF-8\)/\1/' /etc/locale.gen
|
||||
locale-gen
|
||||
|
||||
# --- trust the [tanin] DB-signing key (so Optional TrustAll verifies) ---
|
||||
pacman-key --init
|
||||
pacman-key --populate archlinux
|
||||
pacman-key --add /etc/pacman.d/tanin-repo.gpg
|
||||
pacman-key --lsign-key 63F0415879323F6BFE0FBFB2B6FDF356206AF4F6
|
||||
|
||||
# --- services in the LIVE image ---
|
||||
systemctl enable NetworkManager.service
|
||||
# Live boots to a console on tty1 that auto-launches the installer (cage +
|
||||
# calamares) via getty autologin + /root/.bash_profile. No display-manager.
|
||||
systemctl set-default multi-user.target
|
||||
# greetd is for the TARGET only (Calamares enables it post-install).
|
||||
systemctl disable greetd.service 2>/dev/null || true
|
||||
|
||||
# --- plymouth: add the hook so the target initramfs shows the splash ---
|
||||
# (Calamares regenerates the initramfs on the target; this drop-in is carried
|
||||
# over by unpackfs. 'quiet splash' goes on the kernel cmdline at install time.)
|
||||
if ! grep -q plymouth /etc/mkinitcpio.conf 2>/dev/null; then
|
||||
sed -i 's/^\(HOOKS=.*\)\(udev\)/\1\2 plymouth/' /etc/mkinitcpio.conf 2>/dev/null || true
|
||||
fi
|
||||
Reference in New Issue
Block a user