From 83f4dd238b9ce5c8fa649b57807bf5ce582bc6f2 Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Thu, 28 Feb 2013 18:03:21 +0100
Subject: use INIT_DIR instead of STAGE32_DIR

---
 remote/tools/base/base.build | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'remote/tools')

diff --git a/remote/tools/base/base.build b/remote/tools/base/base.build
index 516a3f34..569d4e15 100644
--- a/remote/tools/base/base.build
+++ b/remote/tools/base/base.build
@@ -87,24 +87,23 @@ post_copy() {
 	mkdir -p ${INIT_DIR}/root
 
 	echo "minilinux-$(hostname)" > "${INIT_DIR}/etc/hostname"
-
 	#check for kernel modules, if not present copy from system
-	if [ ! -d ${STAGE32_DIR}/lib/modules ];
+	if [ ! -d ${INIT_DIR}/lib/modules ];
 	then
 		pinfo "Copying modules for kernel $(uname -r)..."
-		mkdir -p "${STAGE32_DIR}/lib/modules" || perror "Cannot create '${STAGE32_DIR}/lib/modules'"
-		cp -r "/lib/modules/$(uname -r)" "${STAGE32_DIR}/lib/modules/" || perror "Cannot copy kernel modules from '/lib/modules/$(uname -r)' '${STAGE32_DIR}/lib/modules/'"
+		mkdir -p "${INIT_DIR}/lib/modules" || perror "Cannot create '${INIT_DIR}/lib/modules'"
+		cp -r "/lib/modules/$(uname -r)" "${INIT_DIR}/lib/modules/" || perror "Cannot copy kernel modules from '/lib/modules/$(uname -r)' '${INIT_DIR}/lib/modules/'"
 	else
-		pinfo "Not copying kernel modules from system, as '${STAGE32_DIR}/lib/modules/' already exists."
+		pinfo "Not copying kernel modules from system, as '${INIT_DIR}/lib/modules/' already exists."
 	fi
 
 	#check for firmware, if not present copy from system
-	if [ ! -d ${STAGE32_DIR}/lib/firmware ];
+	if [ ! -d ${INIT_DIR}/lib/firmware ];
 	then
 		pinfo "Copying firmware for kernel $(uname -r)..."
-		cp -r "/lib/firmware" "${STAGE32_DIR}/lib/" || perror "Cannot copy kernel modules from '/lib/firmware' '${STAGE32_DIR}/lib/'"
+		cp -r "/lib/firmware" "${INIT_DIR}/lib/" || perror "Cannot copy kernel modules from '/lib/firmware' '${INIT_DIR}/lib/'"
 	else
-		pinfo "Not copying firmware from system, as '${STAGE32_DIR}/lib/firmware' already exists."
+		pinfo "Not copying firmware from system, as '${INIT_DIR}/lib/firmware' already exists."
 	fi	
 
 }
-- 
cgit v1.2.3-55-g7522