From fae10229a05803f657cc71d98b6e60bf588d5e17 Mon Sep 17 00:00:00 2001 From: Michael Neves Date: Tue, 14 May 2013 13:20:41 +0200 Subject: Add openslx log dir --- remote/rootfs/rootfs-stage32/rootfs-stage32.build | 3 +++ 1 file changed, 3 insertions(+) (limited to 'remote') diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build index 2e214c5d..7d639450 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build @@ -62,6 +62,9 @@ post_copy() { # make basic directory structure mkdir -p "${TARGET_BUILD_DIR}"/{bin,dev,proc,lib,etc,mnt,sys,var/run,var/lock,var/log,run/lock,run/shm,opt/openslx/mnt} + # make openslx log directory + mkdir -p "${TARGET_BUILD_DIR}"/var/log/openslx + # copy devices from running system cp -a /dev/{console,kmsg,mem,null,shm,tty,tty0,tty1,tty9,fb0,urandom,zero} \ "${TARGET_BUILD_DIR}"/dev || perror "Copying devices from running system failed." -- cgit v1.2.3-55-g7522 From f75155fde91ef7c395ec835840b57a5a078e8649 Mon Sep 17 00:00:00 2001 From: Michael Neves Date: Tue, 14 May 2013 13:21:17 +0200 Subject: vmware --- remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env | 7 +++++-- remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf | 8 ++++---- remote/modules/vmplayer/data/opt/openslx/bin/vmplayer | 10 ---------- remote/modules/vmplayer/vmplayer.build | 3 +++ 4 files changed, 12 insertions(+), 16 deletions(-) (limited to 'remote') diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env index f4901070..41360bb3 100755 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env @@ -14,6 +14,8 @@ # §generated§ # ----------------------------------------------------------------------------- +export PATH=$PATH:/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin + #functions: helper functions tempdir () { # Create a special tempfs directory @@ -54,7 +56,7 @@ if [ -n "$vmnet1" ] ; then echo "1" >/proc/sys/net/ipv4/conf/vmnet1/forwarding 2>/dev/null echo "1" >/proc/sys/net/ipv4/conf/br0/forwarding 2>/dev/null fi - /opt/openslx/rootfs/usr/sbin/udhcpd \ + /opt/openslx/usr/sbin/udhcpd \ -S /etc/vmware/udhcpd/udhcpd-vmnet1.conf fi if [ -n "$vmnet8" ] ; then @@ -77,6 +79,7 @@ fi vmblock () { # let point the path directly to the directory where the binary lives +# TODO: get it to work /usr/bin/vmware-usbarbitrator } @@ -93,7 +96,7 @@ case "$1" in tempdir load_modules vmnetif - vmblock +# vmblock ;; stop) diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf index a67adc18..5a52ca41 100644 --- a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf +++ b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware.conf @@ -1,8 +1,8 @@ # configuration file for vmware background services written in stage3 setup -vmnet0=true -vmnet1=192.168.101.1/24 -vmnet1nat=true -vmnet8=192.168.102.1/24 +#vmnet0=true +#vmnet1=192.168.101.1/24 +#vmnet1nat=true +#vmnet8=192.168.102.1/24 # stage1 variables produced during plugin install version="5.0" buildversion="1031769" diff --git a/remote/modules/vmplayer/data/opt/openslx/bin/vmplayer b/remote/modules/vmplayer/data/opt/openslx/bin/vmplayer index 2b6e8f31..030e9175 100755 --- a/remote/modules/vmplayer/data/opt/openslx/bin/vmplayer +++ b/remote/modules/vmplayer/data/opt/openslx/bin/vmplayer @@ -1,14 +1,4 @@ #!/bin/sh - -for mod in /lib/modules/vmware/*.ko; do - insmod "$mod" && continue - xmessage "Could not load kernel module $mod. vmplayer might fail." -done - -export LIBCONF_DIR=/usr/lib/vmware/libconf - -#/usr/lib/vmware/bin/vmplayer $@ - # radically simplified version of the original script vmplayer by VMware Inc. PREFIX=/usr/lib/vmware # depends on the vmware location exec "$PREFIX"'/lib/wrapper-gtk24.sh' \ diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index 2ef2ed68..c0067b01 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -1,4 +1,7 @@ fetch_source() { + #mount vmware bundle directory + [ ! -d /mnt/store/vmware ] && mkdir -p /mnt/store/vmware + mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store/vmware || perror "Could not mount vmware bundle directory. Exiting." ARCH=$(uname -m) [ "$ARCH" = "i686" ] && ARCH=i386 local BUNDLE="$(find /mnt/store/vmware -type f -name "VMware-Player*.${ARCH}.bundle" | head -1)" -- cgit v1.2.3-55-g7522 From 8c4942f02b72b694ac8e5c71616af22a0a25e8bf Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 14 May 2013 16:19:39 +0200 Subject: copy the saved vmware config file back :) --- remote/modules/vmplayer/vmplayer.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'remote') diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build index 63f44fdd..1e3090ac 100644 --- a/remote/modules/vmplayer/vmplayer.build +++ b/remote/modules/vmplayer/vmplayer.build @@ -127,6 +127,7 @@ EOF mkdir -p "$TARGET_BUILD_DIR/lib/modules/vmware/" cp "/lib/modules/$UTS_RELEASE/vmplayer/"* "$TARGET_BUILD_DIR/lib/modules/vmware/" || perror "Could not cp vmware modules to target!" + [ -e /etc/vmware/config ] && rm -f /etc/vmware/config + cp /etc/vmware/config.mltk.bak /etc/vmware/config } - -- cgit v1.2.3-55-g7522 From e1634cf16726349c855e0cd02c8dd5eabd4f1243 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 14 May 2013 17:01:50 +0200 Subject: fix udhcpc --- remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'remote') diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ index 256c6f49..f3d7d4c2 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ @@ -7,4 +7,4 @@ NET_IP=$(ip addr show dev ${NET_IF} | grep "inet " | awk -F " " '{print $2}' | a UDHCPC_OPTS="" [ ! -z "$NET_IP" ] && UDHCPC_OPTS=" -r $NET_IP " -/opt/openslx/sbin/udhcpc $UDHCPC_OPTS -O domain -O nissrv -O nisdomain -O wpad -t 8 -s /etc/udhcpc.openslx.script -i $NET_IF +/opt/openslx/sbin/udhcpc $UDHCPC_OPTS -O domain -O nissrv -O nisdomain -O wpad -t 8 -s /etc/openslx/udhcpc.openslx.script -i $NET_IF -- cgit v1.2.3-55-g7522 From 44f951959faf8a09ff60cda4024bccd9efd633a1 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Tue, 14 May 2013 17:02:15 +0200 Subject: openbox --- .../modules/openbox/data/etc/xdg/openbox/menu.xml | 29 ++++++++++++++++++++++ remote/modules/openbox/openbox.build | 18 ++++++++++++++ remote/modules/openbox/openbox.conf | 12 +++++++++ remote/targets/stage32/openbox | 1 + 4 files changed, 60 insertions(+) create mode 100644 remote/modules/openbox/data/etc/xdg/openbox/menu.xml create mode 100644 remote/modules/openbox/openbox.build create mode 100644 remote/modules/openbox/openbox.conf create mode 120000 remote/targets/stage32/openbox (limited to 'remote') diff --git a/remote/modules/openbox/data/etc/xdg/openbox/menu.xml b/remote/modules/openbox/data/etc/xdg/openbox/menu.xml new file mode 100644 index 00000000..b53d6ae6 --- /dev/null +++ b/remote/modules/openbox/data/etc/xdg/openbox/menu.xml @@ -0,0 +1,29 @@ + + + + + + + xterm + + + vmchooser -c /etc/openslx/vmchooser/vmchooser.conf + + + + + + + + + + + + + + + + diff --git a/remote/modules/openbox/openbox.build b/remote/modules/openbox/openbox.build new file mode 100644 index 00000000..3e56fbfb --- /dev/null +++ b/remote/modules/openbox/openbox.build @@ -0,0 +1,18 @@ +fetch_source() { + : +} + +build() { + COPYLIST="list_dpkg_output" + [ -e "$COPYLIST" ] && rm "$COPYLIST" + + list_packet_files >> "$COPYLIST" + tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}" + + return 0 +} + +post_copy() { + [ ! -d "$TARGET_BUILD_DIR/etc/pango" ] && mkdir -p "$TARGET_BUILD_DIR/etc/pango" + pango-querymodules > "$TARGET_BUILD_DIR/etc/pango/pango.modules" +} diff --git a/remote/modules/openbox/openbox.conf b/remote/modules/openbox/openbox.conf new file mode 100644 index 00000000..67c63c4c --- /dev/null +++ b/remote/modules/openbox/openbox.conf @@ -0,0 +1,12 @@ +REQUIRED_DEPENDENCIES=" openbox + libpango1.0-0" +REQUIRED_PACKAGES=" openbox + libpango1.0-0" +REQUIRED_BINARIES=" openbox + openbox-session" +REQUIRED_FILES=" /usr/share/xsessions/openbox.desktop" +REQUIRED_DIRECTORIES=" /etc + /usr/lib/openbox + /usr/share/themes/Clearlooks + /usr/lib/$ARCH_TRIPLET/pango/" + diff --git a/remote/targets/stage32/openbox b/remote/targets/stage32/openbox new file mode 120000 index 00000000..0fb8d86d --- /dev/null +++ b/remote/targets/stage32/openbox @@ -0,0 +1 @@ +../../modules/openbox \ No newline at end of file -- cgit v1.2.3-55-g7522