Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

3 files changed, 53 insertions, 3 deletions

diff --git a/remote/modules/beamergui/data/opt/openslx/scripts/beamergui-x_mode_setter b/remote/modules/beamergui/data/opt/openslx/scripts/beamergui-x_mode_setter
new file mode 100755
index 00000000..ae81b280
--- /dev/null
+++ b/remote/modules/beamergui/data/opt/openslx/scripts/beamergui-x_mode_setter
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# List all modes
+declare -a MODES
+#16:10
+MODES=("${MODES[@]}" "1280x800  83.50  1280 1352 1480 1680 800  803  809  831  -hsync +vsync")
+MODES=("${MODES[@]}" "1440x1050 106.50 1440 1528 1672 1904 900  903  909  934  -hsync +vsync")
+MODES=("${MODES[@]}" "1680x1200 146.25 1680 1784 1960 2240 1050 1053 1059 1089 -hsync +vsync")
+MODES=("${MODES[@]}" "1920x1200 193.25 1920 2056 2256 2592 1200 1203 1209 1245 -hsync +vsync")
+MODES=("${MODES[@]}" "2560x1600 348.50 2560 2760 3032 3504 1600 1603 1609 1658 -hsync +vsync")
+#16:9
+MODES=("${MODES[@]}" "1280x720  74.50  1280 1344 1472 1664 720  723  728  748  -hsync +vsync")
+MODES=("${MODES[@]}" "1368x768  85.25  1368 1440 1576 1784 768  771  781  798  -hsync +vsync")
+MODES=("${MODES[@]}" "1600x900  118.25 1600 1696 1856 2112 900  903  908  934  -hsync +vsync")
+MODES=("${MODES[@]}" "1920x1080 173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync")
+MODES=("${MODES[@]}" "2560x1440 312.25 2560 2752 3024 3488 1440 1443 1448 1493 -hsync +vsync")
+#4:3
+MODES=("${MODES[@]}" "800x600   38.25  800  832  912  1024 600  603  607  624  -hsync +vsync")
+MODES=("${MODES[@]}" "1024x768  63.50  1024 1072 1176 1328 768  771  775  798  -hsync +vsync")
+MODES=("${MODES[@]}" "1152x864  81.75  1152 1216 1336 1520 864  867  871  897  -hsync +vsync")
+MODES=("${MODES[@]}" "1280x960  101.25 1280 1360 1488 1696 960  963  967  996  -hsync +vsync")
+MODES=("${MODES[@]}" "1400x1050 121.75 1400 1488 1632 1864 1050 1053 1057 1089 -hsync +vsync")
+
+# Create all modes
+for i in "${MODES[@]}"; do
+  #echo -e "\e[32mxrandr --current --newmode $i\e[0m"
+  xrandr --current --newmode $i > /dev/null 2>&1 
+done
+
+# Get the connected outputs
+declare -a OUTPUTNAMES
+while read line; do
+  OUTPUTNAMES+=("$(echo "$line" | grep -o "^\S*" )")
+done < <( xrandr | grep -i " connected" )
+
+# Add the modes to all outputs
+for i in "${OUTPUTNAMES[@]}"; do 
+  for j in "${MODES[@]}"; do 
+    #echo -e  "\e[32mxrandr --current --addmode $i $(echo $j| awk '{print $1;}')\e[0m"
+    xrandr --current --addmode $i $(echo $j| awk '{print $1;}')
+  done
+done
diff --git a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
index c0195eeb..8533f421 100755
--- a/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
+++ b/remote/modules/pam/data/opt/openslx/scripts/pam_script_ses_open
@@ -42,9 +42,9 @@ Your home directory contents is unavailable.
 DO NOT SAVE ANYTHING HERE AS ALL WILL BE LOST UPON REBOOT!
 EOF
 # Try to get the user's attention (probably unsuccessful anyways)
-for ext in doc docx xls xlsx ppt pptx odt rtf wri ini inf; do
-	for fname in WARNING WARNUNG ACHTUNG VORSICHT STOPP ATTENTION CAREFUL OBACHT; do
-		ln -s "WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}"
+for ext in doc xls ppt odt; do
+	for fname in WARNING ACHTUNG ATTENTION; do
+		ln "${PERSISTENT_HOME_DIR}/WARNING.txt" "${PERSISTENT_HOME_DIR}/${fname}.${ext}"
 	done
 done
 
diff --git a/remote/modules/xorg/data/etc/X11/Xsession b/remote/modules/xorg/data/etc/X11/Xsession
index 15867190..dc64cf77 100644..100755
--- a/remote/modules/xorg/data/etc/X11/Xsession
+++ b/remote/modules/xorg/data/etc/X11/Xsession
@@ -2,6 +2,14 @@
 
 #Workaround to start Xsession. The original Xsession script includes error handling functionality and sources other scrips from the Xsession.d/ directory.
 
+SESSIONDIR="/etc/X11/Xsession.d"
+
+if [ -d "$SESSIONDIR" ]; then
+	for file in $SESSIONDIR/*; do
+		. $file || slxlog "xsession" "Xsession: Could not source $file" "$file"
+	done
+fi
+
 #start selected session
 case "$1" in
 	failsafe)