diff -ruN lda-new/Xreset.deb.patch lda-new_AlberT/Xreset.deb.patch
--- lda-new/Xreset.deb.patch	1970-01-01 01:00:00.000000000 +0100
+++ lda-new_AlberT/Xreset.deb.patch	2005-09-30 17:13:46.000000000 +0200
@@ -0,0 +1,9 @@
+--- Xreset.dist	2005-09-07 18:01:46.000000000 +0200
++++ Xreset	2005-09-07 18:02:44.000000000 +0200
+@@ -13,3 +13,6 @@
+                    -x /etc/kde3/kdm/Xservers "$USER"
+       # NOTREACHED
+ fi
+
+#echo "$USER logged off on $DISPLAY" >> /var/tmp/xstartup.log
+++/usr/local/bin/LDA-shutdown.sh >> /var/tmp/xstartup.log 2>&1
diff -ruN lda-new/Xstartup.deb.patch lda-new_AlberT/Xstartup.deb.patch
--- lda-new/Xstartup.deb.patch	1970-01-01 01:00:00.000000000 +0100
+++ lda-new_AlberT/Xstartup.deb.patch	2005-09-30 17:13:46.000000000 +0200
@@ -0,0 +1,17 @@
+--- Xstartup.dist	2005-09-07 18:01:33.000000000 +0200
++++ Xstartup	2005-09-07 18:19:18.000000000 +0200
+@@ -14,9 +14,14 @@
+   fi
+ fi
+
+# codice di prova
+#echo "User $USER logged in on $DISPLAY" >> /var/tmp/xstartup.log
+ /usr/local/bin/LDA-setup.sh >> /var/tmp/xstartup.log 2>&1
+
+ if grep -qs '^use-sessreg' /etc/kde3/kdm/kdm.options && \
+     which sessreg > /dev/null 2>&1; then
+         exec sessreg -a -l "$DISPLAY" -u /var/run/utmp \
+                      -x /etc/kde3/kdm/Xservers "$USER"
+     # NOTREACHED
+ fi
+
diff -ruN lda-new/setup lda-new_AlberT/setup
--- lda-new/setup	2005-08-09 10:48:40.000000000 +0200
+++ lda-new_AlberT/setup	2005-09-30 17:15:07.000000000 +0200
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 LTS_HOME=/opt/ltsp
+if [ -e /etc/ltsp.conf ]; then
+	LTS_HOME="`grep -e '^[[:blank:]]*LTSP_DIR' /etc/ltsp.conf | cut -d= -f2 | tr -d '[:blank:]'`"
+fi
 
 CP="cp -i"
 MV="mv -i"
@@ -15,7 +18,7 @@
 	exit 1
 fi
 
-echo -n "Copying LDA-* in /usr/local/bin..."
+echo "Copying LDA-* in /usr/local/bin..."
 $CP LDA-*.sh /usr/local/bin
 chmod 755 /usr/local/bin/LDA-*.sh
 chown root:root /usr/local/bin/LDA-*.sh
@@ -28,11 +31,11 @@
 $CP $LTS_HOME/i386/etc/rc.localdev $LTS_HOME/i386/etc/rc.localdev.$TODAY
 
 echo "Patching rc.localdev."
-cd $LTS_HOME/i386/etc && patch < $THISPWD/rc.localdev.patch
+cd $LTS_HOME/i386/etc && patch -l < $THISPWD/rc.localdev.patch
 cd -
 #$CP rc.localdev $LTS_HOME/i386/etc/rc.localdev
 
-echo -n "Adding $LTS_HOME/i386/etc/symbiont_media to inittab (will be backed up)..."
+echo "Adding $LTS_HOME/i386/etc/symbiont_media to inittab (will be backed up)..."
 if ! grep -q SYM $LTS_HOME/i386/etc/inittab ; then
 	$CP $LTS_HOME/i386/etc/inittab $LTS_HOME/i386/etc/inittab.$TODAY
 	echo "SYM:345:respawn:/etc/symbiont_media" >> $LTS_HOME/i386/etc/inittab
@@ -42,16 +45,35 @@
 chown root:root $LTS_HOME/i386/etc/symbiont_media
 echo "done."
 
+#check if we are on debian system
+if [ -x "/usr/sbin/update-rc.d" ]; then
+	echo "Well, it seems we are on a GNU/Debian system..."
+	KDMDIR="/etc/kde3/kdm"
+	DISTRO="deb"
+else
+	KDMDIR="/etc/kde/kdm"
+	DISTRO=""
+fi
+
 echo "Patching KDE Xstartup and Xreset files (will be backed up)..."
-if [ -e "/etc/kde/kdm/Xstartup" ]; then
-	cd /etc/kde/kdm && patch < "$THISPWD/Xstartup.patch"
+if [ -e "${KDMDIR}/Xstartup" ]; then
+	XSTARTUP_PATCH="${THISPWD}/Xstartup.patch"
+	if [ -e "${THISPWD}/Xstartup.${DISTRO}.patch" ]; then
+		XSTARTUP_PATCH="${THISPWD}/Xstartup.${DISTRO}.patch"
+	fi
+	echo $XSTARTUP_PATCH
+	cd $KDMDIR && patch -l < "$XSTARTUP_PATCH"
 	cd -
 else
 	echo "    Xstartup does not exist."
 fi
 
-if [ -e "/etc/kde/kdm/Xreset" ]; then
-	cd /etc/kde/kdm && patch < "$THISPWD/Xreset.patch"
+if [ -e "${KDMDIR}/Xreset" ]; then
+	XRESET_PATCH="${THISPWD}/Xreset.patch"
+	if [ -e "${THISPWD}/Xreset.${DISTRO}.patch" ]; then
+		XRESET_PATCH="${THISPWD}/Xreset.${DISTRO}.patch"
+	fi
+	cd $KDMDIR && patch -l < "$XRESET_PATCH"
 	cd -	
 else
 	echo "    Xreset does not exist."
@@ -61,13 +83,13 @@
 cat <<EOF
 
   ****************************************************
-  *                                                  *
-  * Setup has finished. Please check your settings   *
-  * in $LTS_HOME/i386/etc/lts.conf against           *
-  * the sample lts.conf in this directory.           *
-  *                                                  *
-  * Ciao!                                            *
-  *                                                  *
+
+   Setup has finished. Please check your settings
+   in $LTS_HOME/i386/etc/lts.conf against
+   the sample lts.conf in this directory.
+
+   Ciao!
+
   ****************************************************
 
 EOF

