diff options
| author | Michael Neves | 2013-03-19 17:22:20 +0100 |
|---|---|---|
| committer | Michael Neves | 2013-03-19 17:22:20 +0100 |
| commit | 42ea7dbe1defff420a50045350d9b99b44257f92 (patch) | |
| tree | b390a9c80572bf6b5f625b65f92f97442f0ec446 /remote/rootfs | |
| parent | deleted files (diff) | |
| parent | renamed targets stage3.* to stage3* (diff) | |
| download | tm-scripts-42ea7dbe1defff420a50045350d9b99b44257f92.tar.gz tm-scripts-42ea7dbe1defff420a50045350d9b99b44257f92.tar.xz tm-scripts-42ea7dbe1defff420a50045350d9b99b44257f92.zip | |
merge
Diffstat (limited to 'remote/rootfs')
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/init | 13 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage31/rootfs-stage31.build | 4 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage31/rootfs-stage31.conf | 1 |
3 files changed, 11 insertions, 7 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index ef9c32a7..5f614bb3 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -12,9 +12,10 @@ # First script for initial ramfs for OpenSLX linux stateless clients ############################################################################# -export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/openslx/bin:/openslx/sbin +export PATH=/bin:/sbin:/usr/bin:/usr/sbin export LD_LIBRARY_PATH=/usr/lib64 + mount -n -t tmpfs -o 'mode=755' run "/run" # mount the important standard directories @@ -28,6 +29,7 @@ echo "/sbin/mdev" > /proc/sys/kernel/hotplug ( hwinfo --netcard > /etc/netcard ) & # read kernel command line for debugging switch +DEBUG=0 read KCL < /proc/cmdline export KCL for opts in ${KCL}; do @@ -49,9 +51,6 @@ done while ps | grep -v grep | grep -q " hwinfo --gfxcard" ; do usleep 10 ; done -# always load framebuffer -modprobe uvesafb mode_option=1024x768-32 mtrr=3 scroll=ywrap - case $(cat /etc/hwinfo) in *i915*) modprobe -a i915 2>/dev/null @@ -69,6 +68,7 @@ case $(cat /etc/hwinfo) in modprobe -q mga 2>/dev/null ;; *VMWARE*) + modprobe -q uvesafb mode_option=1024x768-32 mtrr=3 scroll=ywrap 2>/dev/null modprove -q vmwgfx 2>/dev/null ;; *) @@ -77,7 +77,7 @@ case $(cat /etc/hwinfo) in esac (modprobe -a drm; mdev -s ) & -if [ "x$SPLASH" == "x1" ]; then +if [ "x$SPLASH" == "x1" -a "x$DEBUG" != "x1" ]; then # start plymouth plymouthd && plymouth show-splash fi @@ -98,7 +98,6 @@ fi # setup network nwif="eth0" # set up loopback networking -[ $DEBUGLEVEL -eq 20 ] && echo "** starting ip config at $(sysup)" ip link set dev lo up 2>/dev/null ip addr add 127.0.0.1/8 dev lo 2>/dev/null ip link set dev $nwif up 2>/dev/null || { echo "No link for $nwif, dropping to shell.."; setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'; } @@ -163,6 +162,6 @@ for mnt in proc sys run ; do done unset BOOT_IMAGE initrd -[ "x$SPLASH" = "x1" ] && plymouth update-root-fs --new-root-dir=/mnt +[ "x$SPLASH" == "x1" -a "x$DEBUG" != "x1" ] && plymouth update-root-fs --new-root-dir=/mnt # new style of pivoting (switch_root or run-init) exec /sbin/switch_root -c /dev/console /mnt /usr/lib/systemd/systemd diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.build b/remote/rootfs/rootfs-stage31/rootfs-stage31.build index e5e45312..e660b0ff 100644 --- a/remote/rootfs/rootfs-stage31/rootfs-stage31.build +++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.build @@ -23,6 +23,10 @@ post_copy() { copy_kernel_modules generate_modules_map_files copy_firmware + + # copy busybox that has been under /openslx back to / + cp -r "${TARGET_BUILD_DIR}"/openslx/* "${TARGET_BUILD_DIR}" + #rm -rf "${TARGET_BUILD_DIR}/openslx" } # diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf index ea9fd580..422f9b43 100644 --- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf +++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf @@ -1,3 +1,4 @@ +REQUIRED_MODULES=" busybox" REQUIRED_BINARIES=" v86d" REQUIRED_KERNEL_MODULES=" kernel/drivers/video/sis/sisfb.ko kernel/drivers/video/via/viafb.ko |