From c29d49d84418075e1887c965d978c7cc0e07a95f Mon Sep 17 00:00:00 2001
From: maximilian attems <maks@debian.org>
Date: Tue, 18 Apr 2006 13:44:02 +0200
Subject: 0.60: - bug script - cryptoroot support - change exported variables -
 nfsopts, rootflags support - warn lilo+grub install - doc fixes

---
 scripts/functions | 4 ++++
 scripts/local     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/functions b/scripts/functions
index 8cf6ddc..96a5577 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -161,6 +161,10 @@ call_scripts()
 {
 	for cs_x in ${runlist}; do
 		${initdir}/${cs_x}
+		# allow boot scripts to modify exported boot paramaters
+		if [ -e /conf/param.conf ]; then
+			. /conf/param.conf
+		fi
 	done
 }
 
diff --git a/scripts/local b/scripts/local
index dd5924d..25aca70 100644
--- a/scripts/local
+++ b/scripts/local
@@ -53,7 +53,7 @@ mountroot ()
 
 	# FIXME This has no error checking
 	# Mount root
-	mount ${roflag} -t ${FSTYPE} ${ROOT} ${rootmnt}
+	mount ${roflag} -t ${FSTYPE} ${ROOTFLAGS} ${ROOT} ${rootmnt}
 
 	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/log-bottom"
 	run_scripts /scripts/local-bottom
-- 
cgit v1.2.3