summaryrefslogtreecommitdiffstats
path: root/core/modules/beamergui/data
diff options
context:
space:
mode:
authorSimon Rettberg2018-11-16 14:26:36 +0100
committerSimon Rettberg2018-11-16 14:26:36 +0100
commitdba8b4b66995deaee4f76d965e90b34d282ccf91 (patch)
tree59762a67b426e72f93c100ebe5e92199bc8004f3 /core/modules/beamergui/data
parent[dnbd3] Bump version (diff)
downloadmltk-dba8b4b66995deaee4f76d965e90b34d282ccf91.tar.gz
mltk-dba8b4b66995deaee4f76d965e90b34d282ccf91.tar.xz
mltk-dba8b4b66995deaee4f76d965e90b34d282ccf91.zip
[beamergui] Update to 2.0, move parse-edid to own module
Diffstat (limited to 'core/modules/beamergui/data')
-rwxr-xr-xcore/modules/beamergui/data/etc/X11/Xsession.d/98-modesetter-wrapper5
-rwxr-xr-xcore/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script13
-rwxr-xr-xcore/modules/beamergui/data/etc/X11/Xsetup.d/99-set-centered-clone11
-rw-r--r--core/modules/beamergui/data/etc/dbus-1/system.d/de.bwlehrpool.beamergui.conf14
-rw-r--r--core/modules/beamergui/data/etc/udev/rules.d/99-beamergui.rules3
-rwxr-xr-xcore/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui3
6 files changed, 40 insertions, 9 deletions
diff --git a/core/modules/beamergui/data/etc/X11/Xsession.d/98-modesetter-wrapper b/core/modules/beamergui/data/etc/X11/Xsession.d/98-modesetter-wrapper
deleted file mode 100755
index 59c1c8ed..00000000
--- a/core/modules/beamergui/data/etc/X11/Xsession.d/98-modesetter-wrapper
+++ /dev/null
@@ -1,5 +0,0 @@
-# Beamergui detection and setup
-
-# Explicitely call bash for the modesetter
-/bin/bash /opt/openslx/scripts/beamergui-mode_setter >/dev/null 2>&1
-
diff --git a/core/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script b/core/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script
index 18717dd6..981e87ba 100755
--- a/core/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script
+++ b/core/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script
@@ -1,2 +1,13 @@
#!/bin/ash
-/opt/openslx/bin/beamergui &
+
+/opt/openslx/bin/beamergui -a
+# Detach
+/bin/bash <<HERE
+{
+ ulimit -c unlimited
+ cd /tmp/
+ /opt/openslx/bin/beamergui -b &
+} &
+HERE
+true
+
diff --git a/core/modules/beamergui/data/etc/X11/Xsetup.d/99-set-centered-clone b/core/modules/beamergui/data/etc/X11/Xsetup.d/99-set-centered-clone
new file mode 100755
index 00000000..dae7ed55
--- /dev/null
+++ b/core/modules/beamergui/data/etc/X11/Xsetup.d/99-set-centered-clone
@@ -0,0 +1,11 @@
+#!/bin/ash -- being sourced
+
+# Detach
+/bin/bash <<HERE
+{
+ sleep 1
+ /opt/openslx/bin/beamergui -c
+} &
+HERE
+true
+
diff --git a/core/modules/beamergui/data/etc/dbus-1/system.d/de.bwlehrpool.beamergui.conf b/core/modules/beamergui/data/etc/dbus-1/system.d/de.bwlehrpool.beamergui.conf
new file mode 100644
index 00000000..d3adf9bc
--- /dev/null
+++ b/core/modules/beamergui/data/etc/dbus-1/system.d/de.bwlehrpool.beamergui.conf
@@ -0,0 +1,14 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+ <policy user="root">
+ <allow own="de.bwlehrpool.beamergui"/>
+ <allow send_destination="de.bwlehrpool.beamergui"/>
+ </policy>
+ <policy context="default">
+ <deny own="de.bwlehrpool.beamergui"/>
+ <deny send_destination="de.bwlehrpool.beamergui"/>
+ </policy>
+</busconfig>
+
diff --git a/core/modules/beamergui/data/etc/udev/rules.d/99-beamergui.rules b/core/modules/beamergui/data/etc/udev/rules.d/99-beamergui.rules
new file mode 100644
index 00000000..06364e20
--- /dev/null
+++ b/core/modules/beamergui/data/etc/udev/rules.d/99-beamergui.rules
@@ -0,0 +1,3 @@
+# Tell beamergui to show up
+#
+SUBSYSTEM=="drm", ACTION=="change", RUN+="/opt/openslx/bin/beamergui -w"
diff --git a/core/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui b/core/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui
deleted file mode 100755
index 1b4e61c8..00000000
--- a/core/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/ash
-killall beamergui
-exit 0