diff options
| -rwxr-xr-x | data/stage3.1/init | 5 | ||||
| -rwxr-xr-x | data/stage3.1/lib/i386-linux-gnu/ld-2.15.so | bin | 134344 -> 0 bytes | |||
| -rwxr-xr-x | data/stage3.1/lib/i386-linux-gnu/libc-2.15.so | bin | 1713640 -> 0 bytes | |||
| l--------- | data/stage3.1/lib/i386-linux-gnu/libc.so.6 | 1 | ||||
| -rw-r--r-- | data/stage3.1/lib/i386-linux-gnu/libdbus-1.so.3 | bin | 296228 -> 0 bytes | |||
| -rw-r--r-- | data/stage3.1/lib/i386-linux-gnu/libdl.so.2 | bin | 13940 -> 0 bytes | |||
| -rwxr-xr-x | data/stage3.1/lib/i386-linux-gnu/libpthread.so.0 | bin | 124663 -> 0 bytes | |||
| -rw-r--r-- | data/stage3.1/lib/i386-linux-gnu/librt.so.1 | bin | 30684 -> 0 bytes | |||
| -rw-r--r-- | data/stage3.1/lib/i386-linux-gnu/libtirpc.so.1 | bin | 158196 -> 0 bytes | |||
| l--------- | data/stage3.1/lib/ld-linux.so.2 | 1 | ||||
| -rw-r--r-- | data/stage3.1/lib/libgssglue.so.1 | bin | 34516 -> 0 bytes | |||
| -rw-r--r-- | data/stage3.1/lib/libhal.so.1 | bin | 71108 -> 0 bytes | |||
| -rw-r--r-- | data/stage3.1/lib/libhd.so.16 | bin | 1894652 -> 0 bytes | |||
| -rwxr-xr-x | server/build_core | 3 |
14 files changed, 6 insertions, 4 deletions
diff --git a/data/stage3.1/init b/data/stage3.1/init index c51abbea..7e633ff9 100755 --- a/data/stage3.1/init +++ b/data/stage3.1/init @@ -13,6 +13,7 @@ ############################################################################# export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/openslx/bin:/openslx/sbin +export LD_LIBRARY_PATH=/openslx/lib mount -n -t tmpfs -o 'mode=755' run "/run" @@ -35,7 +36,7 @@ mount -n -t aufs -o br:/dev/shm/uniontmp:/rorootfs=ro none /mnt mkdir -p /mnt/uniontmp /mnt/tmp mount -n --move /dev/shm/uniontmp /mnt/uniontmp -ln -s /mnt/lib/modules /lib/ +ln -sf /mnt/lib / cat /proc/uptime >/mnt/tmp/runtime @@ -67,6 +68,8 @@ case $(cat /etc/hwinfo) in esac ( modprobe -a drm fbcon; mdev -s ) & +#ln -s /mnt/share / + # load required network and usb controller drivers, filter out wireless adaptors while ps | grep -v grep | grep -q " hwinfo --netcard" ; do usleep 10 ; done nwcardlist="forcedeth|e1000e|e1000|e100|tg3|via-rhine|r8169|pcnet32" diff --git a/data/stage3.1/lib/i386-linux-gnu/ld-2.15.so b/data/stage3.1/lib/i386-linux-gnu/ld-2.15.so Binary files differdeleted file mode 100755 index d2306d9b..00000000 --- a/data/stage3.1/lib/i386-linux-gnu/ld-2.15.so +++ /dev/null diff --git a/data/stage3.1/lib/i386-linux-gnu/libc-2.15.so b/data/stage3.1/lib/i386-linux-gnu/libc-2.15.so Binary files differdeleted file mode 100755 index 8c11121e..00000000 --- a/data/stage3.1/lib/i386-linux-gnu/libc-2.15.so +++ /dev/null diff --git a/data/stage3.1/lib/i386-linux-gnu/libc.so.6 b/data/stage3.1/lib/i386-linux-gnu/libc.so.6 deleted file mode 120000 index a8f42ce3..00000000 --- a/data/stage3.1/lib/i386-linux-gnu/libc.so.6 +++ /dev/null @@ -1 +0,0 @@ -libc-2.15.so
\ No newline at end of file diff --git a/data/stage3.1/lib/i386-linux-gnu/libdbus-1.so.3 b/data/stage3.1/lib/i386-linux-gnu/libdbus-1.so.3 Binary files differdeleted file mode 100644 index 14354c09..00000000 --- a/data/stage3.1/lib/i386-linux-gnu/libdbus-1.so.3 +++ /dev/null diff --git a/data/stage3.1/lib/i386-linux-gnu/libdl.so.2 b/data/stage3.1/lib/i386-linux-gnu/libdl.so.2 Binary files differdeleted file mode 100644 index 01235729..00000000 --- a/data/stage3.1/lib/i386-linux-gnu/libdl.so.2 +++ /dev/null diff --git a/data/stage3.1/lib/i386-linux-gnu/libpthread.so.0 b/data/stage3.1/lib/i386-linux-gnu/libpthread.so.0 Binary files differdeleted file mode 100755 index a4bfc228..00000000 --- a/data/stage3.1/lib/i386-linux-gnu/libpthread.so.0 +++ /dev/null diff --git a/data/stage3.1/lib/i386-linux-gnu/librt.so.1 b/data/stage3.1/lib/i386-linux-gnu/librt.so.1 Binary files differdeleted file mode 100644 index 4d3d88ad..00000000 --- a/data/stage3.1/lib/i386-linux-gnu/librt.so.1 +++ /dev/null diff --git a/data/stage3.1/lib/i386-linux-gnu/libtirpc.so.1 b/data/stage3.1/lib/i386-linux-gnu/libtirpc.so.1 Binary files differdeleted file mode 100644 index a1590656..00000000 --- a/data/stage3.1/lib/i386-linux-gnu/libtirpc.so.1 +++ /dev/null diff --git a/data/stage3.1/lib/ld-linux.so.2 b/data/stage3.1/lib/ld-linux.so.2 deleted file mode 120000 index 2e367466..00000000 --- a/data/stage3.1/lib/ld-linux.so.2 +++ /dev/null @@ -1 +0,0 @@ -i386-linux-gnu/ld-2.15.so
\ No newline at end of file diff --git a/data/stage3.1/lib/libgssglue.so.1 b/data/stage3.1/lib/libgssglue.so.1 Binary files differdeleted file mode 100644 index 6bdfe13a..00000000 --- a/data/stage3.1/lib/libgssglue.so.1 +++ /dev/null diff --git a/data/stage3.1/lib/libhal.so.1 b/data/stage3.1/lib/libhal.so.1 Binary files differdeleted file mode 100644 index a4a4a9f9..00000000 --- a/data/stage3.1/lib/libhal.so.1 +++ /dev/null diff --git a/data/stage3.1/lib/libhd.so.16 b/data/stage3.1/lib/libhd.so.16 Binary files differdeleted file mode 100644 index c7764846..00000000 --- a/data/stage3.1/lib/libhd.so.16 +++ /dev/null diff --git a/server/build_core b/server/build_core index 3b1e0f19..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,6 +72,7 @@ generate_rootfs() { cp -r ${STAGE32_DIR}/openslx/* ${STAGE31_STATIC_DIR}/* ${STAGE31_DIR} # fix for aufs & squashfs modules needed for stage 3.1 + 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/ |