From be228cb40809f78004045d75d82a090f460c3f30 Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Thu, 28 Feb 2013 18:16:01 +0100
Subject: make squashfs verbose, copy modules.* from /lib/modules

---
 server/build_core      | 5 ++++-
 server/stage31.modules | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/build_core b/server/build_core
index 33a23c5a..8bea4043 100755
--- a/server/build_core
+++ b/server/build_core
@@ -91,6 +91,9 @@ generate_rootfs() {
 	else
 		pinfo "Not copying firmware from system, as '${STAGE31_DIR}/lib/firmware' already exists."
 	fi
+
+	#quick fix for modules.* files
+	cp /lib/modules/$(uname -r)/modules.* ${STAGE31_DIR}/lib/modules/$(uname -r)/
 	
 	#generate initramfs
 	generate_initramfs "initramfs" "${STAGE31_DIR}"
@@ -101,7 +104,7 @@ generate_squashfs() {
 	local TOOL_STR="$TOOL_STR generate_squashfs:"
 	[ -e "${MODULE_DIR}/openslx/mnt/openslx.sqfs" ] && rm "${MODULE_DIR}/openslx/mnt/openslx.sqfs"
 	pinfo "Writing openslx.sqfs to '${MODULE_DIR}/openslx/mnt/'"
-	mksquashfs "${STAGE32_DIR}" "${MODULE_DIR}/openslx/mnt/openslx.sqfs" -comp xz -b 1M -no-recovery || perror "mksquashfs failed ($?)."
+	mksquashfs "${STAGE32_DIR}" "${MODULE_DIR}/openslx/mnt/openslx.sqfs" -comp xz -b 1M -no-recovery >&6 || perror "mksquashfs failed ($?)."
 	generate_initramfs "initramfs2" "${MODULE_DIR}/openslx"
 }
 
diff --git a/server/stage31.modules b/server/stage31.modules
index 26538246..f35cc276 100644
--- a/server/stage31.modules
+++ b/server/stage31.modules
@@ -49,4 +49,3 @@
 ./net/802/stp.ko
 ./net/bridge/bridge.ko
 ./ubuntu/aufs/aufs.ko
-../modules.*
-- 
cgit v1.2.3-55-g7522