debxo-*: replace autox with nodm

[xodist] / configs / debxo-lxde / hooks

diff --git a/configs/debxo-lxde/hooks b/configs/debxo-lxde/hooks
index d1cc47ef60f67a541a69eb97f288e57275373da7..100e635446d33458211c63b79c628f35fc470f0e 100644 (file)
--- a/configs/debxo-lxde/hooks
+++ b/configs/debxo-lxde/hooks
@@ -71,8 +71,7 @@ EOF
 
        # install some custom packages that aren't on mirrors.  ugly hack!
        k="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/autox_0.1_all.deb"
+ http://lunge.mit.edu/~dilinger/debxo-0.4/linux-2.6.25.15_2.6.25.15-165_i386.deb"
        mkdir -p cache
        for i in $k; do
                pkg=$(basename ${i})
@@ -84,9 +83,6 @@ EOF
                rm -f ${ROOT_DIR}/${pkg}
        done
 
-       # take some packages that are okay to upgrade off hold
-       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,9 +91,11 @@ 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 nodm
+       F=${ROOT_DIR}/etc/default/nodm
+       if [ -f ${F} ]; then
+               sed --in-place "s/NODM_USER=.*$/NODM_USER=${DEFUSER}/" ${F}
+               sed --in-place "s/NODM_ENABLED=.*$/NODM_ENABLED=true/" ${F}
        fi
 
 }