Add domain waiting for gdm and kdm

master3.3
Mike Hiretsky 14 years ago
parent cd7db3eafa
commit 8c47fc2f26

@ -0,0 +1 @@
# Calculate name=Default.old link=/etc/X11/gdm/Init/Default mirror load(/etc/X11/gdm/Init/Default.old)==

@ -0,0 +1,6 @@
# Calculate chmod=755 name=Default
#!/bin/bash
/usr/share/calculate-2.2/xdm/wait_domain
OLDDEFAULT=/etc/X11/gdm/Init/Default.old
[[ -f $OLDDEFAULT ]] && source $OLDDEFAULT

@ -1,3 +1,5 @@
# Calculate format=kde
[X-*Core]
Setup=/usr/share/calculate-2.2/xdm/wait_domain
[X-*-Greeter]
MinShowUID=1000

@ -0,0 +1 @@
# Calculate name=Default link=/etc/X11/gdm/Init/Default.old mirror load(/etc/X11/gdm/Init/Default.old)!=

@ -0,0 +1 @@
# Calculate append=remove name=Default.old

@ -1,3 +1,5 @@
# Calculate format=kde pkg(kde-base/kdm)!=
[X-*Core]
Setup=/usr/share/config/kdm/Xsetup
[X-*-Greeter]
MinShowUID=999

@ -0,0 +1,26 @@
#! /bin/sh
# Xsetup - run as root before the login dialog appears
source /usr/share/calculate-2.2/xdm/functions
# wait for answer ldap server
LDAPCONF=/etc/ldap.conf
if [ -e ${LDAPCONF} ]
then
SERVER=`sed -rn 's/^host\s+(.*)$/\1/p' /etc/ldap.conf`
BINDDN=`sed -nr 's/^binddn\s+(.*)$/\1/p' /etc/ldap.conf`
BINDPW=`sed -nr 's/^bindpw\s+(.*)$/\1/p' /etc/ldap.conf`
# wait 20 sec
for i in {0..40}
do
ldapsearch -h ${SERVER} -D ${BINDDN} -w ${BINDPW} &>/dev/null
[[ $? -eq 32 ]] && break
if [[ $i -eq 0 ]]
then
xmessage -buttons "" "Waiting for the response from the domain server" &
XMESPID=$!
fi
sleep 0.5
done
[[ -n $XMESPID ]] && kill $XMESPID &>/dev/null
fi

@ -74,13 +74,16 @@ data_files += [('/usr/share/calculate-2.2/xdm/login.d',
['data/login.d/10client'])] +\
[('/usr/share/calculate-2.2/xdm/logout.d',
['data/logout.d/10client'])] +\
[('/usr/share/calculate-2.2/xdm/',
['data/wait_domain'])] +\
[('/var/calculate/templates', [])]
class cl_install_data(install_data):
def run (self):
install_data.run(self)
data_file = [("/etc/init.d/client",0755)]
data_file = [("/etc/init.d/client",0755),
("/usr/share/calculate-2.2/xdm/wait_domain",0755)]
fileNames = map(lambda x: os.path.split(x[0])[1], data_file)
listNames = map(lambda x: filter(lambda y: y, x[0].split("/")),data_file)
data_find = {}

Loading…
Cancel
Save