| 1 |
commit: 8ffbf0d3923ea3c752dccb508d011ae88c66c1af |
| 2 |
Author: Evgeny Grin <k2k <AT> narod <DOT> ru> |
| 3 |
AuthorDate: Mon Jun 29 19:35:50 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 30 07:59:52 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ffbf0d3 |
| 7 |
|
| 8 |
x11-misc/lightdm: Fixed lightdm Xsession wrapper to report only really sourced files |
| 9 |
|
| 10 |
Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/16496 |
| 12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 13 |
|
| 14 |
x11-misc/lightdm/files/Xsession | 4 ++-- |
| 15 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/x11-misc/lightdm/files/Xsession b/x11-misc/lightdm/files/Xsession |
| 18 |
index 50ce80fd3e1..d982a0ac89e 100644 |
| 19 |
--- a/x11-misc/lightdm/files/Xsession |
| 20 |
+++ b/x11-misc/lightdm/files/Xsession |
| 21 |
@@ -50,8 +50,8 @@ command="$@" |
| 22 |
xinitdir="/etc/X11/xinit/xinitrc.d" |
| 23 |
if [ -d "$xinitdir" ]; then |
| 24 |
for script in $xinitdir/*; do |
| 25 |
- echo "Loading xinit script $script" |
| 26 |
if [ -x "$script" -a ! -d "$script" ]; then |
| 27 |
+ echo "Loading xinit script $script" |
| 28 |
. "$script" |
| 29 |
fi |
| 30 |
done |
| 31 |
@@ -62,8 +62,8 @@ xsessionddir="/etc/X11/Xsession.d" |
| 32 |
if [ -d "$xsessionddir" ]; then |
| 33 |
for i in `ls $xsessionddir`; do |
| 34 |
script="$xsessionddir/$i" |
| 35 |
- echo "Loading X session script $script" |
| 36 |
if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then |
| 37 |
+ echo "Loading X session script $script" |
| 38 |
. "$script" |
| 39 |
fi |
| 40 |
done |
Archives