summaryrefslogtreecommitdiffstats
path: root/remote
diff options
context:
space:
mode:
authorMichael Neves2013-05-09 17:57:42 +0200
committerMichael Neves2013-05-09 17:57:42 +0200
commite14b5596dadcdaeb4bc0dfca96be45f9343bf5e5 (patch)
tree0b4aae9887bc62a2f2ac656d98036508c110b79e /remote
parentMerge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff)
parentMerge branch 'master' of git:openslx-ng/tm-scripts (diff)
downloadtm-scripts-e14b5596dadcdaeb4bc0dfca96be45f9343bf5e5.tar.gz
tm-scripts-e14b5596dadcdaeb4bc0dfca96be45f9343bf5e5.tar.xz
tm-scripts-e14b5596dadcdaeb4bc0dfca96be45f9343bf5e5.zip
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
-rw-r--r--remote/modules/vmplayer/vmplayer.build2
-rw-r--r--remote/modules/vmplayer/vmplayer.conf2
-rw-r--r--remote/rootfs/rootfs-stage32/data/etc/modprobe.d/blacklist3
-rwxr-xr-xremote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script2
4 files changed, 5 insertions, 4 deletions
diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build
index eb6fc8e5..4053e5c1 100644
--- a/remote/modules/vmplayer/vmplayer.build
+++ b/remote/modules/vmplayer/vmplayer.build
@@ -26,8 +26,6 @@ build() {
cp -r ./src/vmware-vmx/lib/{bin,icu,lib,libconf,scripts} "$TARGET" || perror "Could not copy many things from vmware-vmx."
ln -s /usr/lib/vmware/bin/appLoader "$TARGET/bin/vmplayer" || perror "Could not link vmplayer to appLoader."
chmod +x "$TARGET"/bin/*
- chmod +x "$MODULE_BUILD_DIR"/bin/*
- chmod +x "$MODULE_BUILD_DIR"/sbin/*
# Compile kernel modules
return 0 # TODO: Fix kompalieren
pinfo "Compiling required kernel modules."
diff --git a/remote/modules/vmplayer/vmplayer.conf b/remote/modules/vmplayer/vmplayer.conf
index 65fda83d..c5d92140 100644
--- a/remote/modules/vmplayer/vmplayer.conf
+++ b/remote/modules/vmplayer/vmplayer.conf
@@ -1,3 +1,3 @@
REQUIRED_BINARIES=""
REQUIRED_SYSTEM_FILES=""
-REQUIRED_DIRECTORIES="/bin /etc /lib /usr"
+REQUIRED_DIRECTORIES="/etc /usr"
diff --git a/remote/rootfs/rootfs-stage32/data/etc/modprobe.d/blacklist b/remote/rootfs/rootfs-stage32/data/etc/modprobe.d/blacklist
new file mode 100644
index 00000000..cedabdcb
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/etc/modprobe.d/blacklist
@@ -0,0 +1,3 @@
+# evbug byebye
+blacklist evbug
+blacklist pcspkr
diff --git a/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script b/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script
index eddf3bd1..0bdd796d 100755
--- a/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script
+++ b/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script
@@ -61,7 +61,7 @@ search lp.ruf.uni-freiburg.de
fi
# TODO i.e. event trigger
- [ "x$(grep -ci mount /proc/cmdline)" == "x0" ] && systemctl start nfs-mount.service
+ [ "x$(grep -ci mount /proc/cmdline)" != "x0" ] && systemctl start nfs-mount.service
;;