allow legacy autorandr to be off while connected

[deb_pkgs/autorandr.git] / pm-utils / 40autorandr

diff --git a/pm-utils/40autorandr b/pm-utils/40autorandr
index 4ce7790255d1041db62637f495d1625912306441..b8b2beebac6f385f90c6b8f4f104e6ee6001d134 100755 (executable)
--- a/pm-utils/40autorandr
+++ b/pm-utils/40autorandr
@@ -7,10 +7,10 @@ exec > /var/log/autorandr.log 2>&1
 FORM=${0##*40}
 case $FORM in
        auto-disper)
-               AUTORANDR="auto-disper -c"
+               AUTORANDR="auto-disper -c --default default"
                ;;
        *)
-               AUTORANDR="autorandr -c"
+               AUTORANDR="autorandr -c --default default"
                ;;
 esac
 
@@ -18,14 +18,13 @@ detect_display()
 {
        for X in /tmp/.X11-unix/X*; do
                D="${X##/tmp/.X11-unix/X}"
-               user=$(w -h | awk -vD="$D" '$3 ~ ":"D"(\\.[0-9])?$" {print $1}' | head -1)
+               user=`who | awk -vD="$D" '$2 ~ ":"D"(.[0-9])?$" {print $1}' | head -1`
                if [ x"$user" != x"" ]; then
                        logger "autorandr: Changing display configuration for user '$user'"
                        export DISPLAY=":$D"
                        /bin/su -c "${AUTORANDR}" "$user"
                fi
        done
-       echo "Done"
 }
 
 case "$1" in