From 5ac8871bdc5093eb2b570937dcc37167b904cb8e Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Tue, 24 Jan 2006 12:27:42 +0100
Subject: sync 0.40ubuntu16

---
 scripts/functions             | 18 ++++++++++++++----
 scripts/init-premount/thermal | 16 ++++++++++------
 2 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'scripts')

diff --git a/scripts/functions b/scripts/functions
index f9cad01..7f8fa3c 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -35,12 +35,22 @@ log_end_msg()
 		/sbin/usplash_write "SUCCESS ok"
 	fi
 	_log_msg "Done."
+	update_progress
 }
 
-# update_progress() # ToDo: NOP placeholder... what else for usplash?
-# {
-#     :
-# }
+update_progress()
+{
+	if [ -z "$PROGRESS_STATE" ]; then
+		export PROGRESS_STATE=0
+	fi
+
+	PROGRESS_STATE=$(($PROGRESS_STATE + 1))
+	echo "PROGRESS_STATE=${PROGRESS_STATE}" > /dev/.initramfs/progress_state
+
+	if [ -x /sbin/usplash_write ]; then
+		/sbin/usplash_write "PROGRESS $PROGRESS_STATE"
+	fi
+}
 
 panic()
 {
diff --git a/scripts/init-premount/thermal b/scripts/init-premount/thermal
index e0d79c3..a41f6f3 100755
--- a/scripts/init-premount/thermal
+++ b/scripts/init-premount/thermal
@@ -15,9 +15,13 @@ prereqs)
 	;;
 esac
 
-# For ACPI systems
-modprobe -q fan
-modprobe -q thermal
-
-# For ppc64 systems
-modprobe -q therm_pm72
+case "$DPKG_ARCH" in
+# load the right modules
+powerpc|ppc64)
+	modprobe -q therm_pm72
+	;;
+i386|amd64|ia64)
+	modprobe -q fan
+	modprobe -q thermal
+	;;
+esac
-- 
cgit v1.2.3