From 553aa3742ca43b4ba4e87b2dea2c5d31cc43a124 Mon Sep 17 00:00:00 2001
From: Scott James Remnant <scott@ubuntu.com>
Date: Wed, 16 Dec 2009 17:47:49 +0000
Subject: mkinitramfs: generate pre-cached boot order file

if tsort is available, use it instead of custom sorting code
if a pre-cached order file is available, use that instead

[ move cache_run_scripts from scripts/functions to hook-scripts
  as only used on mkinitramfs build and not on boot ]

Signed-off-by: maximilian attems <maks@debian.org>
---
 hook-functions    | 16 ++++++++++++++++
 mkinitramfs       |  5 +++++
 scripts/functions | 27 ++++++++++++++++++++++++---
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/hook-functions b/hook-functions
index ab2f486..cf41e42 100644
--- a/hook-functions
+++ b/hook-functions
@@ -485,6 +485,22 @@ EOF
 
 }
 
+# cache boot scripts order
+cache_run_scripts()
+{
+	DESTDIR=${1}
+	scriptdir=${2}
+	initdir=${DESTDIR}${scriptdir}
+	[ ! -d ${initdir} ] && return
+
+	runlist=$(get_prereq_pairs | tsort)
+	for crs_x in ${runlist}; do
+		[ -f ${initdir}/${crs_x} ] || continue
+		echo "${scriptdir}/${crs_x}" >> ${initdir}/ORDER
+		echo "[ -e /conf/param.conf ] && . /conf/param.conf" >> ${initdir}/ORDER
+	done
+}
+
 # minimal supported kernel version
 check_minkver()
 {
diff --git a/mkinitramfs b/mkinitramfs
index f7e484d..6eed876 100755
--- a/mkinitramfs
+++ b/mkinitramfs
@@ -269,6 +269,11 @@ fi
 run_scripts /usr/share/initramfs-tools/hooks
 run_scripts "${CONFDIR}"/hooks
 
+# cache boot run order
+for b in $(cd "${DESTDIR}/scripts" && find . -mindepth 1 -type d); do
+	cache_run_scripts "${DESTDIR}" "/scripts/${b#./}"
+done
+
 # generate module deps
 depmod -a -b "${DESTDIR}" ${version}
 rm "${DESTDIR}/lib/modules/${version}"/modules.*map
diff --git a/scripts/functions b/scripts/functions
index 9b864ae..7b68255 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -186,9 +186,22 @@ reduce_prereqs()
 	done
 }
 
+get_prereq_pairs()
+{
+	set_initlist
+	for gp_x in ${initlist}; do
+		echo ${gp_x} ${gp_x}
+		prereqs=$(${initdir}/${gp_x} prereqs)
+		for prereq in ${prereqs}; do
+			echo ${prereq} ${gp_x}
+		done
+	done
+}
+
 call_scripts()
 {
 	for cs_x in ${runlist}; do
+		[ -f ${initdir}/${cs_x} ] || continue
 		# mkinitramfs verbose output
 		if [ "${verbose}" = "y" ]; then
 			echo "Calling hook ${cs_x}"
@@ -205,9 +218,17 @@ run_scripts()
 {
 	initdir=${1}
 	[ ! -d ${initdir} ] && return
-	get_prereqs
-	reduce_prereqs
-	call_scripts
+	
+	if [ -f ${initdir}/ORDER ]; then
+		. ${initdir}/ORDER
+	elif command -v tsort >/dev/null 2>&1; then
+		runlist=$(get_prereq_pairs | tsort)
+		call_scripts $2
+	else
+		get_prereqs
+		reduce_prereqs
+		call_scripts
+	fi
 }
 
 # Load custom modules first
-- 
cgit v1.2.3