Make consolefont code deferrable to avoid destroying splash

1 files changed, 28 insertions, 0 deletions

diff --git a/functions b/functions
index 4dca333..b7b9511 100644
--- a/functions
+++ b/functions
@@ -271,6 +271,34 @@ run_hook() {
 	done
 }
 
+# Function for setting console font if required
+set_consolefont() {
+    if [ -n "$CONSOLEFONT" ]; then
+	stat_busy "Loading Console Font: $CONSOLEFONT"
+	#CONSOLEMAP in UTF-8 shouldn't be used
+	if [ -n "$CONSOLEMAP" ] && echo "$LOCALE" | /bin/grep -qi utf ; then
+		CONSOLEMAP=""
+	fi
+	for i in /dev/tty[0-9]*; do
+		if [ -n "$CONSOLEMAP" ]; then
+			/usr/bin/setfont -m $CONSOLEMAP $CONSOLEFONT -C ${i} >/dev/null 2>&1
+		else
+			/usr/bin/setfont $CONSOLEFONT -C ${i} >/dev/null 2>&1
+		fi
+	done
+	if [ $? -ne 0 ]; then
+		stat_fail
+	else
+		for i in /dev/tty[0-9]*; do
+			printf "\033(K" > ${i}
+		done
+		# the $CONSOLE check helps us avoid this when running scripts from cron
+		echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\033(K"; fi' >>/etc/profile.d/locale.sh
+		stat_done
+	fi
+    fi
+}
+
 # Source additional functions at the end to allow overrides
 for f in /etc/rc.d/functions.d/*; do
   if [ -e $f ]; then