From: Andres Salomon <dilinger@collabora.co.uk>
Date: Thu, 28 May 2009 23:30:30 +0000 (-0400)
Subject: mkchroot: re-add gdm and kdm to gnome and kde images, respectively
X-Git-Tag: v0.6~62
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eedfdd4024f1e559d21571f5802dc6d0b2f4c7dc;p=xodist

mkchroot: re-add gdm and kdm to gnome and kde images, respectively

autox is great for xfce/lxde, but gnome requires extra crud in order to
support "log-out" and such.  So, use gdm/kdm for gnome/kde.

Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
---

diff --git a/configs/debxo-gnome/hooks b/configs/debxo-gnome/hooks
index 7921733..02c022c 100644
--- a/configs/debxo-gnome/hooks
+++ b/configs/debxo-gnome/hooks
@@ -70,8 +70,7 @@ EOF
 	k="http://lunge.mit.edu/~dilinger/debxo-0.2/initramfs-tools_0.92l.2_all.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.4/linux-2.6.25.15_2.6.25.15-165_i386.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.5/xserver-xorg-video-geode_2.11.0-0.3_i386.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.5/autox_0.1_all.deb"
+ http://lunge.mit.edu/~dilinger/debxo-0.5/xserver-xorg-video-geode_2.11.0-0.3_i386.deb"
 	mkdir -p cache
 	for i in $k; do
 		pkg=$(basename ${i})
@@ -85,7 +84,6 @@ EOF
 
 	# take some packages that are okay to upgrade off hold
 	echo xserver-xorg-video-geode install | (chroot ${ROOT_DIR} dpkg --set-selections)
-	echo autox install | (chroot ${ROOT_DIR} dpkg --set-selections)
 
 	# No longer a need for xorg.conf
 	rm -f ${ROOT_DIR}/etc/X11/xorg.conf
@@ -95,11 +93,6 @@ EOF
 		cp 30-keymap-olpc.fdi ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/
 	fi
 
-	# configure autox
-	if [ -f ${ROOT_DIR}/etc/default/autox ]; then
-		sed --in-place "s/USER=$/USER=${DEFUSER}/" ${ROOT_DIR}/etc/default/autox
-	fi
-
 	# configure gnome
 	if [ -d ${ROOT_DIR}/etc/gconf/2 ]; then
 		cat >${ROOT_DIR}/etc/gconf/2/local-defaults.path<<EOF
@@ -110,6 +103,11 @@ EOF
 		cp %gconf-tree.xml ${ROOT_DIR}/etc/gconf/debxo.xml.defaults/
 	fi
 
+	# configure gdm
+	if [ -d ${ROOT_DIR}/etc/gdm ]; then
+		sed -i "s_\[daemon\]_\[daemon\]\n\nGreeter=/usr/lib/gdm/gdmlogin\n\nAutomaticLoginEnable=true\n\nAutomaticLogin=${DEFUSER}_" ${ROOT_DIR}/etc/gdm/gdm.conf
+	fi
+
 }
 
 cleanup_chroot_hook()
diff --git a/configs/debxo-gnome/packages b/configs/debxo-gnome/packages
index 3c0c1f4..7cf341a 100644
--- a/configs/debxo-gnome/packages
+++ b/configs/debxo-gnome/packages
@@ -33,14 +33,12 @@ xfonts-100dpi
 xfonts-scalable
 xfonts-base
 x11-xserver-utils
-xinit
-xauth
 
 # the gnome and desktop stuff
 menu
 aspell-en
 ttf-liberation
-#gdm
+gdm
 gnome-core
 gnome-backgrounds
 gnome-power-manager
diff --git a/configs/debxo-kde/hooks b/configs/debxo-kde/hooks
index 0af18b5..03a73ba 100644
--- a/configs/debxo-kde/hooks
+++ b/configs/debxo-kde/hooks
@@ -69,8 +69,7 @@ EOF
 	k="http://lunge.mit.edu/~dilinger/debxo-0.2/initramfs-tools_0.92l.2_all.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.2/ofw-config_0.1_all.deb 
  http://lunge.mit.edu/~dilinger/debxo-0.4/linux-2.6.25.15_2.6.25.15-165_i386.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.5/xserver-xorg-video-geode_2.11.0-0.3_i386.deb 
- http://lunge.mit.edu/~dilinger/debxo-0.5/autox_0.1_all.deb"
+ http://lunge.mit.edu/~dilinger/debxo-0.5/xserver-xorg-video-geode_2.11.0-0.3_i386.deb"
 	mkdir -p cache
 	for i in $k; do
 		pkg=$(basename ${i})
@@ -84,7 +83,6 @@ EOF
 
 	# take some packages that are okay to upgrade off hold
 	echo xserver-xorg-video-geode install | (chroot ${ROOT_DIR} dpkg --set-selections)
-	echo autox install | (chroot ${ROOT_DIR} dpkg --set-selections)
 
 	# No longer a need for xorg.conf
 	rm -f ${ROOT_DIR}/etc/X11/xorg.conf
@@ -94,9 +92,9 @@ EOF
 		cp 30-keymap-olpc.fdi ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/
 	fi
 
-	# configure autox
-	if [ -f ${ROOT_DIR}/etc/default/autox ]; then
-		sed --in-place "s/USER=$/USER=${DEFUSER}/" ${ROOT_DIR}/etc/default/autox
+	# configure kdm
+	if [ -d ${ROOT_DIR}/etc/kde3/kdm ]; then
+		sed --in-place "s/AllowNullPasswd=false/AllowNullPasswd=true/;s/#AutoLoginEnable=true/AutoLoginEnable=true/;s/#AutoLoginUser=fred/AutoLoginUser=${DEFUSER}/" ${ROOT_DIR}/etc/kde3/kdm/kdmrc
 	fi
 
 }