drop kdm/gdm, use autox instead

Signed-off-by: Andres Salomon <dilinger@debian.org>

diff --git a/awesome.packages b/awesome.packages
index c7b2777fef72c3c3c9384868f586796fbbc2a081..35d8983ec8ee20e9ccde0b1b9420e8812f567ce2 100644 (file)
--- a/awesome.packages
+++ b/awesome.packages
@@ -16,7 +16,6 @@ aspell-en
 info
 manpages-dev
 rsync
-gdm
 awesome
 stalonetray
 network-manager-gnome

diff --git a/gnome.packages b/gnome.packages
index b2d202b2c18ce40469516948f492680521c898d3..f488dfc89d9e67739a71fe335756a275a35d240c 100644 (file)
--- a/gnome.packages
+++ b/gnome.packages
@@ -16,7 +16,6 @@ aspell-en
 info
 manpages-dev
 rsync
-gdm
 gnome-core
 gnome-backgrounds
 gnome-power-manager

diff --git a/initchroot.sh b/initchroot.sh
index 0f6e1b9f94ea8d7411efcc70b91c1e5cc04b4199..6a5239e6743eebf11264fdfe485e08c8a3e9514a 100755 (executable)
--- a/initchroot.sh
+++ b/initchroot.sh
@@ -150,7 +150,8 @@ echo "en_US.UTF-8 UTF-8" >${ROOT_DIR}/etc/locale.gen
 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/xserver-xorg-video-geode_2.11.0-0.3_i386.deb 
+ http://lunge.mit.edu/~dilinger/debxo-0.5/autox_0.1_all.deb"
 mkdir -p cache
 for i in $k; do
        pkg=$(basename ${i})
@@ -163,6 +164,8 @@ for i in $k; do
 done
 # take the geode driver off hold
 echo xserver-xorg-video-geode install | (chroot ${ROOT_DIR} dpkg --set-selections)
+# take autox off hold
+echo autox install | (chroot ${ROOT_DIR} dpkg --set-selections)
 
 # ensure certain modules get loaded during boot
 cat >>${ROOT_DIR}/etc/modules<<EOF
@@ -186,15 +189,12 @@ if [ -d ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/ ]; then
     cp 30-keymap-olpc.fdi ${ROOT_DIR}/usr/share/hal/fdi/information/10freedesktop/
 fi
 
-# configure kdm, kde
-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
+# configure autox
+if [ -f ${ROOT_DIR}/etc/default/autox ]; then
+    sed --in-place "s/USER=$/USER=${DEFUSER}/" ${ROOT_DIR}/etc/default/autox
 fi
 
-# configure gdm, gnome
-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
+# configure gnome
 if [ -d ${ROOT_DIR}/etc/gconf/2 ]; then
     cat >${ROOT_DIR}/etc/gconf/2/local-defaults.path<<EOF
 # DebXO defaults (customized for the XO-1's display

diff --git a/kde.packages b/kde.packages
index 8cf9c8d036e745b2b573a2839a0fb50055f85a54..7c4fcdffe10b749f22846aa3722a0f892aaffb66 100644 (file)
--- a/kde.packages
+++ b/kde.packages
@@ -13,5 +13,4 @@ menu
 aspell-en
 big-cursor
 kde
-kdm
 network-manager-kde

diff --git a/sugar.packages b/sugar.packages
index 4fe06e0051cc8715efe7d68d9240f0ed91cd943e..9bc81e05eacd374c217c97d73d982831fd8441b6 100644 (file)
--- a/sugar.packages
+++ b/sugar.packages
@@ -13,7 +13,6 @@ openntpd
 menu
 aspell-en
 big-cursor
-kdm
 network-manager-gnome
 sugar
 sugar-artwork