summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorSimon Rettberg2013-02-21 16:16:59 +0100
committerSimon Rettberg2013-02-21 16:16:59 +0100
commitd2f356fea9dc9a3c034e160000f1c79c6cef4997 (patch)
tree8c37cb225e89dac828fe46a3e3853f8fd9339f38 /server
parentAdd add_user function to add users and groups to the system (diff)
parent[core] libs and firmware for stage3.1 (diff)
downloadtm-scripts-d2f356fea9dc9a3c034e160000f1c79c6cef4997.tar.gz
tm-scripts-d2f356fea9dc9a3c034e160000f1c79c6cef4997.tar.xz
tm-scripts-d2f356fea9dc9a3c034e160000f1c79c6cef4997.zip
Merge branch 'master' of ssh://openslx/openslx-ng/tm-scripts
Diffstat (limited to 'server')
-rwxr-xr-xserver/build_core7
1 files changed, 4 insertions, 3 deletions
diff --git a/server/build_core b/server/build_core
index 423279e7..c231dc82 100755
--- a/server/build_core
+++ b/server/build_core
@@ -62,7 +62,7 @@ generate_rootfs() {
[ ! -d ${STAGE31_DIR} ] && mkdir -p ${STAGE31_DIR}
# create basic directory structure
- mkdir -p ${STAGE31_DIR}/{bin,dev,proc,run,lib,etc,mnt,sys}
+ mkdir -p ${STAGE31_DIR}/{bin,dev,proc,run,etc,mnt,sys}
# copy device files from running system
cp -a /dev/{console,kmsg,mem,null,tty,tty0,tty1,tty9,urandom,zero} \
@@ -72,8 +72,9 @@ generate_rootfs() {
cp -r ${STAGE32_DIR}/openslx/* ${STAGE31_STATIC_DIR}/* ${STAGE31_DIR}
# fix for aufs & squashfs modules needed for stage 3.1
- #cp /lib/modules/$(uname -r)/kernel/fs/squashfs/squashfs.ko ${STAGE31_DIR}/lib/modules/
- #cp /lib/modules/$(uname -r)/kernel/ubuntu/aufs/aufs.ko ${STAGE31_DIR}/lib/modules/
+ mkdir -p ${STAGE31_DIR}/lib/modules.0/
+ cp /lib/modules/$(uname -r)/kernel/fs/squashfs/squashfs.ko ${STAGE31_DIR}/lib/modules.0/
+ cp /lib/modules/$(uname -r)/kernel/ubuntu/aufs/aufs.ko ${STAGE31_DIR}/lib/modules.0/
# fetch the libraries needed for busybox
BASICLIBS=""