Merge remote-tracking branch 'helterscelter/master'

Conflicts:
	pm-utils/40autorandr

diff --git a/pm-utils/40auto-disper b/pm-utils/40auto-disper
new file mode 120000 (symlink)
index 0000000..9d7b227
--- /dev/null
+++ b/pm-utils/40auto-disper
@@ -0,0 +1 @@
+40autorandr
\ No newline at end of file

diff --git a/pm-utils/40autorandr b/pm-utils/40autorandr
index fc97dea3875a1232e8fb5a3eaf23316a848f39c1..4ce7790255d1041db62637f495d1625912306441 100755 (executable)
--- a/pm-utils/40autorandr
+++ b/pm-utils/40autorandr
@@ -3,7 +3,16 @@
 # 40autorandr: Change autorandr profile on thaw/resume
 exec > /var/log/autorandr.log 2>&1
 
-AUTORANDR="autorandr -c"
+# detect if we are being called as 40auto-disper or 40autorandr
+FORM=${0##*40}
+case $FORM in
+       auto-disper)
+               AUTORANDR="auto-disper -c"
+               ;;
+       *)
+               AUTORANDR="autorandr -c"
+               ;;
+esac
 
 detect_display()
 {
@@ -16,6 +25,7 @@ detect_display()
                        /bin/su -c "${AUTORANDR}" "$user"
                fi
        done
+       echo "Done"
 }
 
 case "$1" in