[gentoo-commits] proj/gentoaster:webui commit in: /, configs/

["Liam McLoughlin" <hexxeh@hexxeh.net>]

commit:     69c8f16a4dfd3966183f5a68e304d343fc88430d
Author:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
AuthorDate: Thu Jul 28 04:50:53 2011 +0000
Commit:     Liam McLoughlin <hexxeh <AT> hexxeh <DOT> net>
CommitDate: Thu Jul 28 04:50:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoaster.git;a=commit;h=69c8f16a

Update XFCE config and fix cachedkernel modules

---
 configs/xfce.ini |    2 +-
 create_image.sh  |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configs/xfce.ini b/configs/xfce.ini
index 4ffcdfd..1173228 100644
--- a/configs/xfce.ini
+++ b/configs/xfce.ini
@@ -9,7 +9,7 @@ HOSTNAME='gentoo'
 ROOT_PASSWORD='g3nt00'
 DEFAULT_USERNAME='gentoo'
 DEFAULT_PASSWORD='g3nt00'
-USE_FLAGS='-gnome -kde -minimal -qt4 dbus jpeg lock session startup-notification thunar udev X branding'
+USE_FLAGS='-gnome -kde -minimal -qt4 dbus jpeg lock session startup-notification thunar udev X branding device-mapper gdu policykit extras'
 PACKAGE_USE=''
 FEATURES='parallel-fetch userfetch userpriv'
 PACKAGE_ACCEPT_KEYWORDS=''

diff --git a/create_image.sh b/create_image.sh
index 30084ba..0ef56d0 100755
--- a/create_image.sh
+++ b/create_image.sh
@@ -207,9 +207,10 @@ echo "Step 17: Setting up kernel"
 # If we got the flag, used a cached kernel to reduce build times for testing
 if [[ ${FLAGS_cachedkernel} -eq ${FLAGS_TRUE} ]]; then
 	echo "Using cached kernel" &>> ${LOG_FILE}
-	KERNEL=`ls -l lib/modules/ | cut -d" " -f9`
 	cp ${TOOL_RES_PATH}/kernel boot/kernel || handle_error "Error copying cached kernel"
-	cp -R ${TOOL_RES_PATH}/modules/* lib/modules/ || handle_error "Error copying cached kernel modules"
+	cp -R ${TOOL_RES_PATH}/modules.tar.gz lib/modules/ || handle_error "Error copying cached kernel modules"
+	tar xvf lib/modules/modules.tar.gz -C lib/modules/ || handle_error "Error extracting cached kernel modules"
+	KERNEL=`ls -l lib/modules/ | cut -d" " -f9 | tr "\n" " "`
 	linux32 chroot . depmod -a ${KERNEL}
 else
 	echo "Downloading/installing kernel sources" &>> ${LOG_FILE}