|
Line
Link Here
|
| 0 |
-- xinit.orig/files/xdm.confd-1 |
0 |
++ xinit/files/xdm.confd-1 |
|
Lines 9-12
CHECKVT=7
Link Here
|
| 9 |
# NOTE: If this is set in /etc/rc.conf, that setting will override this one. |
9 |
# NOTE: If this is set in /etc/rc.conf, that setting will override this one. |
| 10 |
# KDE-specific note: kdm-3.5 and kdm-4.0 are just examples. You will find all |
10 |
# KDE-specific note: kdm-3.5 and kdm-4.0 are just examples. You will find all |
| 11 |
# possible versions by looking at the directories in /usr/kde/. |
11 |
# possible versions by looking at the directories in /usr/kde/. |
|
|
12 |
# NOTE (2): If you want to use your custom DISPLAYMANAGER, you can specify a |
| 13 |
# full path to an executable. |
| 14 |
# |
| 12 |
DISPLAYMANAGER="xdm" |
15 |
DISPLAYMANAGER="xdm" |
| 13 |
-- xinit.orig/files/xdm.initd-3 |
16 |
|
|
|
17 |
# If you specify a custom DISPLAYMANAGER value (one unsupported) |
| 18 |
# you can also specify a custom pidfile that your application is |
| 19 |
# supposed to use and that will be handled by start-stop-daemon |
| 20 |
# to properly start/restart/stop it. |
| 21 |
# If you don't specify any value and use an unsupported DISPLAYMANAGER |
| 22 |
# CUSTOM_DISPLAYMANAGER_PIDFILE will be placed into |
| 23 |
# /var/run/<DISPLAYMANAGER name>.pid |
| 24 |
# CUSTOM_DISPLAYMANAGER_PIDFILE="" |
|
|
25 |
++ xinit/files/xdm.initd-3 |
|
Lines 56-67
depend() {
Link Here
|
| 56 |
|
56 |
|
| 57 |
setup_dm() { |
57 |
setup_dm() { |
| 58 |
local MY_XDM="$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')" |
58 |
local MY_XDM="$(echo "${DISPLAYMANAGER}" | tr '[:upper:]' '[:lower:]')" |
|
|
59 |
local MY_CUSTOM_PIDFILE="$(echo "${CUSTOM_DISPLAYMANAGER_PIDFILE}" | tr '[:upper:]' '[:lower:]')" |
| 60 |
MY_CUSTOM_PIDFILE="${MY_CUSTOM_PIDFILE:-/var/run/$(basename ${MY_XDM}).pid}" |
| 59 |
|
61 |
|
| 60 |
# Load our root path from profile.env |
62 |
# Load our root path from profile.env |
| 61 |
# Needed for kdm |
63 |
# Needed for kdm |
| 62 |
PATH="${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")" |
64 |
PATH="${PATH}:$(. /etc/profile.env; echo "${ROOTPATH}")" |
| 63 |
|
65 |
|
| 64 |
case "${MY_XDM}" in |
66 |
case "${MY_XDM}" in |
|
|
67 |
xdm) |
| 68 |
EXE=/usr/bin/xdm |
| 69 |
PIDFILE=/var/run/xdm.pid |
| 70 |
;; |
| 65 |
kdm|kde|kde2|kde3) |
71 |
kdm|kde|kde2|kde3) |
| 66 |
EXE="$(which kdm)" |
72 |
EXE="$(which kdm)" |
| 67 |
# kdm takes too long to create a pidfile for baselayout-2 |
73 |
# kdm takes too long to create a pidfile for baselayout-2 |
|
Lines 90-102
setup_dm() {
Link Here
|
| 90 |
PIDFILE=/var/run/gpe-dm.pid |
96 |
PIDFILE=/var/run/gpe-dm.pid |
| 91 |
;; |
97 |
;; |
| 92 |
*) |
98 |
*) |
| 93 |
EXE= |
99 |
if [ -x "${MY_XDM}" ] && [ -f "${MY_XDM}" ]; then |
| 94 |
# Fix #65586, where MY_XDM is empty so EXE=somedir |
100 |
EXE="${MY_XDM}" |
| 95 |
[ -x "/usr/bin/${MY_XDM}" ] && [ -f "/usr/bin/${MY_XDM}" ] \ |
101 |
PIDFILE="${MY_CUSTOM_PIDFILE}" |
| 96 |
&& EXE="/usr/bin/${MY_XDM}" |
|
|
| 97 |
if [ -z "${EXE}" ] ; then |
| 98 |
EXE=/usr/bin/xdm |
| 99 |
PIDFILE=/var/run/xdm.pid |
| 100 |
fi |
102 |
fi |
| 101 |
;; |
103 |
;; |
| 102 |
esac |
104 |
esac |
