qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't automatically launch dbus as part of the default user sessions.

Browse Source 
requested by deraadt@ no objection ajacoutot@
This commit is contained in:
matthieu 2015-10-17 08:25:11 +00:00
parent 459538fd05
commit 33d107bfaf
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/xdm/config/Xsession.cpp
View File

@ -1,6 +1,6 @@
XCOMM!SHELL_CMD
XCOMM
XCOMM $OpenBSD: Xsession.cpp,v 1.13 2014/02/25 22:16:24 matthieu Exp $
XCOMM $OpenBSD: Xsession.cpp,v 1.14 2015/10/17 08:25:11 matthieu Exp $
XCOMM redirect errors to a file in user's home directory if we can
@ -105,9 +105,6 @@ else
exec `eval $XDESKTOP`
}
#endif
if [ -x /usr/local/bin/dbus-launch -a -z "${DBUS_SESSION_BUS_ADDRESS}" ]; then
eval `dbus-launch --sh-syntax --exit-with-session`
fi
BINDIR/xterm &
BINDIR/fvwm
fi

7
app/xinit/xinitrc.cpp
View File

@ -1,5 +1,5 @@
XCOMM!SHELL_CMD
XCOMM $OpenBSD: xinitrc.cpp,v 1.12 2014/02/26 14:21:28 matthieu Exp $
XCOMM $OpenBSD: xinitrc.cpp,v 1.13 2015/10/17 08:25:11 matthieu Exp $
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
@ -56,11 +56,6 @@ then
fi
fi
XCOMM if dbus is installed, start its daemon
if [ -x /usr/local/bin/dbus-launch -a -z "${DBUS_SESSION_BUS_ADDRESS}" ]; then
eval `dbus-launch --sh-syntax --exit-with-session`
fi
XCOMM start some nice programs
XCLOCK -geometry 50x50-1+1 &