Bug#759518: x11-common: Print the real name of the executable instead of x-session-manager
Package: x11-common
Followup-For: Bug #759518
Hi,
Yet another version of this patch.
I guess it makes more sense to use the full path of the alternative if
we are testing that it exits just the line before.
Cheers,
Laurent Bigonville
-- System Information:
Debian Release: stretch/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.0.0-2-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_BE.utf8, LC_CTYPE=fr_BE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages x11-common depends on:
ii debconf [debconf-2.0] 1.5.57
ii lsb-base 4.1+Debian13+nmu1
x11-common recommends no packages.
x11-common suggests no packages.
-- debconf information excluded
diff -Nru xorg-7.7+9/debian/local/Xsession.d/50x11-common_determine-startup xorg-7.7+9bigon1/debian/local/Xsession.d/50x11-common_determine-startup
--- xorg-7.7+9/debian/local/Xsession.d/50x11-common_determine-startup 2013-09-26 01:24:29.000000000 +0200
+++ xorg-7.7+9bigon1/debian/local/Xsession.d/50x11-common_determine-startup 2015-08-12 13:09:31.000000000 +0200
@@ -26,11 +26,11 @@
# default session manager, window manager, and terminal emulator.
if [ -z "$STARTUP" ]; then
if [ -x /usr/bin/x-session-manager ]; then
- STARTUP=x-session-manager
+ STARTUP=$(readlink -e /usr/bin/x-session-manager)
elif [ -x /usr/bin/x-window-manager ]; then
- STARTUP=x-window-manager
+ STARTUP=$(readlink -e /usr/bin/x-window-manager)
elif [ -x /usr/bin/x-terminal-emulator ]; then
- STARTUP=x-terminal-emulator
+ STARTUP=$(readlink -e /usr/bin/x-terminal-emulator)
fi
fi
Reply to: