Add xdm fix for pass install

master
Mike Hiretsky 14 years ago
parent a9b1898532
commit ea8ba238bc

@ -1,10 +0,0 @@
--- /etc/init.d/xdm.orig 2010-03-25 18:03:03.000000000 +0300
+++ /etc/init.d/xdm 2010-03-25 18:36:33.000000000 +0300
@@ -189,6 +189,7 @@
if [ -f /etc/.noxdm ] ; then
einfo "Skipping ${EXE}, /etc/.noxdm found"
rm /etc/.noxdm
+ chvt 1
return 0
fi

@ -1,11 +0,0 @@
--- xdm.orig 2010-04-02 17:28:48.000000000 +0400
+++ xdm 2010-04-02 17:28:32.000000000 +0400
@@ -174,7 +174,7 @@
local server=`sed -rn 's/^cl_remote_host\s*=\s*(.*)$/\1/p' ${calculateenv}`
local binddn=`sed -nr 's/^binddn (.*)$/\1/p' /etc/ldap.conf`
local bindpw=`sed -nr 's/^bindpw (.*)$/\1/p' /etc/ldap.conf`
- for i in `seq 0 20`
+ for i in `seq 0 40`
do
ldapsearch -h ${server} -D ${binddn} -w ${bindpw} &>/dev/null
[[ $? -eq 32 ]] && break

@ -1,6 +1,6 @@
--- xdm.orig 2009-09-24 12:03:35.000000000 +0400
+++ xdm 2009-09-24 12:04:08.000000000 +0400
@@ -136,6 +136,22 @@
--- /xdm 2010-04-02 17:48:21.000000000 +0400
+++ /etc/init.d/xdm 2010-04-02 17:48:44.000000000 +0400
@@ -167,12 +167,29 @@
}
start() {
@ -11,7 +11,7 @@
+ local server=`sed -rn 's/^cl_remote_host\s*=\s*(.*)$/\1/p' ${calculateenv}`
+ local binddn=`sed -nr 's/^binddn (.*)$/\1/p' /etc/ldap.conf`
+ local bindpw=`sed -nr 's/^bindpw (.*)$/\1/p' /etc/ldap.conf`
+ for i in `seq 0 20`
+ for i in `seq 0 40`
+ do
+ ldapsearch -h ${server} -D ${binddn} -w ${bindpw} &>/dev/null
+ [[ $? -eq 32 ]] && break
@ -22,4 +22,11 @@
+
local EXE= NAME= PIDFILE=
setup_dm
if [ -f /etc/.noxdm ] ; then
einfo "Skipping ${EXE}, /etc/.noxdm found"
rm /etc/.noxdm
+ chvt 1
return 0
fi
Loading…
Cancel
Save