use autologin/xinit to start X session

Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>

debian/changelog

@@ -1,3 +1,9 @@
+maemo-system-services (0.6.7-0) unstable; urgency=low
+
+  * use autologin/xinit to start X session
+
+ -- Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>  Wed, 21 Sep 2022 07:41:55 +0300
+
 maemo-system-services (0.6.6-0) unstable; urgency=low
 
   * xsession: start icd2 before xsession

debian/control

@@ -18,7 +18,7 @@ Description: Maemo debhelper plugins
 
 Package: maemo-system-services
 Architecture: any
-Depends: sysv-rc | openrc
+Depends: sysv-rc | openrc, autologin, xinit
 Description: definitions of essential maemo system services
  This package contains the definitions of services essential for the
  normal operation of a Maemo system.

debian/maemo-system-services.maintscript

@@ -0,0 +1 @@
+rm_conffile /etc/init.d/xsession 0.6.7~

debian/maemo-system-services.postinst

@@ -9,3 +9,9 @@ if [ -f /etc/init.d/actdead.conf ]; then
 fi
 
 #DEBHELPER#
+
+if [ "$1" = configure ]; then
+	if dpkg --compare-versions "$2" lt 0.6.7; then
+		update-rc.d xsession remove >/dev/null
+	fi
+fi

debian/maemo-system-services.xorg.init

@@ -3,18 +3,16 @@
 description="Xorg Server"
 
 depend() {
-	need dsme
-	after bootmisc rsyslog
+	need dsme mce
+	after bootmisc rsyslog ofono icd2
+	keyword -timeout
+	provide xsession
 }
 
 start() {
     einfo "Starting Xorg Server" > /dev/console
-    XORG_OPTIONS="-logfile /tmp/Xorg.0.log -logverbose 1 -nolisten tcp -noreset -s 0 -core"
-    /usr/sbin/dsmetool -n -8 -r "/usr/bin/Xorg $XORG_OPTIONS"
-}
-
-start_post() {
-    DISPLAY=:0 /usr/sbin/waitx
+    XORG_OPTIONS="-keeptty -logfile /tmp/Xorg.0.log -logverbose 1 -noreset -s 0 -core"
+    /usr/sbin/dsmetool -n -8 -r "autologin user startx -- $XORG_OPTIONS"
 }
 
 stop_post() {

debian/session/Xsession-post

@@ -73,4 +73,4 @@ if [ -n "$SESSIONFILES" ]; then
   set -e
 fi
 
-exit 0
+while :; do sleep infinity; done