aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiam McLoughlin <hexxeh@hexxeh.net>2011-07-28 05:50:53 +0100
committerLiam McLoughlin <hexxeh@hexxeh.net>2011-07-28 05:50:53 +0100
commit69c8f16a4dfd3966183f5a68e304d343fc88430d (patch)
treeeccc0260cc29534db79e935bf3157985a06878bf
parentAdd XFCE configuration (untested) (diff)
downloadgentoaster-69c8f16a4dfd3966183f5a68e304d343fc88430d.tar.gz
gentoaster-69c8f16a4dfd3966183f5a68e304d343fc88430d.tar.bz2
gentoaster-69c8f16a4dfd3966183f5a68e304d343fc88430d.zip
Update XFCE config and fix cachedkernel modules
-rw-r--r--configs/xfce.ini2
-rwxr-xr-xcreate_image.sh5
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}