Skip to content

Commit e8caacf

Browse files
committed
rootfs-create: move armbian-plymouth-theme back to distro-agnostic.sh
Restore the pre-branch install location for armbian-plymouth-theme: post-cache in distro-agnostic.sh, alongside the 'if PLYMOUTH != yes then apt-get remove plymouth' branch. That keeps both halves of the PLYMOUTH toggle in one spot and stops straddling the rootfs-create → distro-agnostic boundary. Previously moved to rootfs-create.sh (before the rootfs cache) so that module_desktops install could apt-install armbian-plymouth-theme from the just-populated apt source. The configng side is changing in lockstep: when mode=build, module_desktops no longer tries to install armbian-plymouth-theme — the build framework installs the locally-built .deb artifact directly instead, here in distro-agnostic.sh.
1 parent 3ba92b7 commit e8caacf

2 files changed

Lines changed: 4 additions & 12 deletions

File tree

lib/functions/rootfs/distro-agnostic.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -413,11 +413,10 @@ function install_distribution_agnostic() {
413413
fi
414414
fi
415415

416-
# armbian-plymouth-theme is now installed in rootfs-create.sh (before
417-
# cache) so it's available when module_desktops install runs. The
418-
# non-plymouth path (remove plymouth) still runs here since it only
419-
# matters on cached images that had plymouth pulled in transitively.
420-
if [[ $PLYMOUTH != yes ]]; then
416+
# install armbian-plymouth-theme
417+
if [[ $PLYMOUTH == yes ]]; then
418+
install_artifact_deb_chroot "armbian-plymouth-theme"
419+
else
421420
chroot_sdcard_apt_get_remove --auto-remove plymouth 2>/dev/null || true
422421
fi
423422

lib/functions/rootfs/rootfs-create.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,6 @@ function create_new_rootfs_cache_via_debootstrap() {
226226
run_host_command_logged rm -fv "${SDCARD}"/etc/resolv.conf
227227
run_host_command_logged echo "nameserver $NAMESERVER" ">" "${SDCARD}"/etc/resolv.conf
228228

229-
# Install plymouth theme BEFORE the desktop install so module_desktops
230-
# finds it already present (armbian-plymouth-theme is a build artifact,
231-
# not an apt.armbian.com package — module_desktops would 404 on it).
232-
if [[ $PLYMOUTH == yes ]]; then
233-
install_artifact_deb_chroot "armbian-plymouth-theme"
234-
fi
235-
236229
# Install desktop via armbian-config INSIDE rootfs-create (before the
237230
# cache tarball is saved) so desktop packages are included in the
238231
# rootfs cache. The Armbian apt repo was configured above by

0 commit comments

Comments
 (0)