diff -Nru wslu-2.3.2/debian/changelog wslu-2.3.2/debian/changelog --- wslu-2.3.2/debian/changelog 2019-11-25 11:38:57.000000000 +0000 +++ wslu-2.3.2/debian/changelog 2019-12-11 07:57:49.000000000 +0000 @@ -1,3 +1,11 @@ +wslu (2.3.2-0ubuntu2~19.10.2) eoan; urgency=medium + + * Revert previous SRU (LP: #1855520): + - Revert "debian/wsl-integration.sh: Use type instead of which for faster execution" + - Revert "Detect X and PulseAudio in WSL2, too" + + -- Balint Reczey Wed, 11 Dec 2019 08:57:49 +0100 + wslu (2.3.2-0ubuntu2~19.10.1) eoan; urgency=medium * Detect X and PulseAudio in WSL2, too (LP: #1853343) diff -Nru wslu-2.3.2/debian/wsl-integration.sh wslu-2.3.2/debian/wsl-integration.sh --- wslu-2.3.2/debian/wsl-integration.sh 2019-11-25 11:38:57.000000000 +0000 +++ wslu-2.3.2/debian/wsl-integration.sh 2019-12-11 07:57:49.000000000 +0000 @@ -1,22 +1,12 @@ -if type pactl > /dev/null 2>&1 || type xvinfo > /dev/null 2>&1; then - # detect WSL host - if type systemd-detect-virt > /dev/null 2>&1 && test "$(systemd-detect-virt -c)" != wsl -a -e /etc/resolv.conf; then - WSL_HOST=$(awk '/nameserver / {print $2; exit}' /etc/resolv.conf 2>/dev/null) - fi - WSL_HOST=${WSL_HOST:-localhost} - - # set DISPLAY if there is an X11 server running - if type xvinfo > /dev/null 2>&1 && env DISPLAY=${WSL_HOST}:0 xvinfo > /dev/null 2>&1; then - export DISPLAY=${WSL_HOST}:0 - export LIBGL_ALWAYS_INDIRECT=1 - fi - - # set up audio if pulse server is reachable only via tcp - if type pactl > /dev/null 2>&1 \ - && (! pactl info > /dev/null 2>&1 || pactl info 2> /dev/null | grep -q 'Default Sink: auto_null' ) \ - && env PULSE_SERVER=tcp:${WSL_HOST} pactl info > /dev/null 2>&1; then - export PULSE_SERVER=tcp:${WSL_HOST} - fi +# set DISPLAY if there is an X11 server running +if which xvinfo > /dev/null && env DISPLAY=:0 xvinfo > /dev/null 2>&1; then + export DISPLAY=:0 + export LIBGL_ALWAYS_INDIRECT=1 +fi - unset WSL_HOST +# set up audio if pulse server is reachable only via tcp +if which pactl > /dev/null \ + && (! pactl info > /dev/null 2>&1 || pactl info 2> /dev/null | grep -q 'Default Sink: auto_null' ) \ + && env PULSE_SERVER=tcp:localhost pactl info > /dev/null 2>&1; then + export PULSE_SERVER=tcp:localhost fi