From 9dd88f75684422925726ca01d5d2e86b4cb7d59f Mon Sep 17 00:00:00 2001
From: BlackNoxis <steven.darklight@gmail.com>
Date: Fri, 14 Aug 2015 22:29:43 +0300
Subject: [live*] modificat eclass live pentru eliminarea confuziei dintre
 thema PLYMOUTH si numele sistemului

---
 eclass/live-artwork.eclass | 2 ++
 eclass/live-kernel.eclass  | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'eclass')

diff --git a/eclass/live-artwork.eclass b/eclass/live-artwork.eclass
index e235550c..5bcbb06a 100644
--- a/eclass/live-artwork.eclass
+++ b/eclass/live-artwork.eclass
@@ -20,8 +20,10 @@ GFX_SPLASH_NAME="${GFX_SPLASH_NAME:-live}"
 # Default plymouth theme name to use
 if [ -d "/etc/kogaion" ] ; then
         PLYMOUTH_THEME="${PLYMOUTH_THEME:-kogaion}"
+		SYSTEM_DISTRO="${SYSTEM_DISTRO:-kogaion}"
 elif [ -d "/etc/argent" ] ; then
         PLYMOUTH_THEME="${PLYMOUTH_THEME:-argent}"
+		SYSTEM_DISTRO="${SYSTEM_DISTRO:-argent}"
 fi
 
 # @FUNCTION: update_kernel_initramfs_splash
diff --git a/eclass/live-kernel.eclass b/eclass/live-kernel.eclass
index 288ebed3..0327124a 100644
--- a/eclass/live-kernel.eclass
+++ b/eclass/live-kernel.eclass
@@ -473,7 +473,7 @@ _kernel_copy_config() {
 
 	local base_path="${DISTDIR}"
 	if [ -n "${K_ROGKERNEL_SELF_TARBALL_NAME}" ]; then
-		base_path="${S}/${PLYMOUTH_THEME}/config"
+		base_path="${S}/${SYSTEM_DISTRO}/config"
 	fi
 
 	local found= cfg=
@@ -874,7 +874,11 @@ live-kernel_pkg_postinst() {
 		fi
 
 		# Update kernel initramfs to match user customizations
-		use splash && update_${PLYMOUTH_THEME}_kernel_initramfs_splash
+		if [[ ${SYSTEM_DISTRO} == "kogaion" ]] ; then
+			use splash && update_kogaion_kernel_initramfs_splash
+		else
+			use splash && update_argent_kernel_initramfs_splash
+		fi
 
 		# Add kernel to grub.conf
 		if use amd64 || use x86; then
-- 
cgit v1.2.3