debxo-*: replace autox with nodm

Someone beat me to writing what would've been called autox.  It's called Nodm,
and it works pretty well.  I've uploaded nodm to backports.org, and this
replaces use of my custom autox stuff with nodm/lenny-backports packages.

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

diff --git a/configs/debxo-awesome/hooks b/configs/debxo-awesome/hooks
index d1cc47ef60f67a541a69eb97f288e57275373da7..100e635446d33458211c63b79c628f35fc470f0e 100644 (file)
--- a/configs/debxo-awesome/hooks
+++ b/configs/debxo-awesome/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
 
 }

diff --git a/configs/debxo-awesome/packages b/configs/debxo-awesome/packages
index ec02a7bc427bfeda35aa154a74382b7056808cee..a924dc670770f6f4531d54fa5ce03e095182127b 100644 (file)
--- a/configs/debxo-awesome/packages
+++ b/configs/debxo-awesome/packages
@@ -34,7 +34,7 @@ xfonts-100dpi
 xfonts-scalable
 xfonts-base
 x11-xserver-utils
-xinit
+nodm/lenny-backports
 xauth
 
 # the desktop stuff

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
 
 }

diff --git a/configs/debxo-lxde/packages b/configs/debxo-lxde/packages
index ca1b80a05cc27228ad2b663ad59d714c4d4b9ce9..5299a99cf2a14ff3a09ff1bbb2b432818abe1c72 100644 (file)
--- a/configs/debxo-lxde/packages
+++ b/configs/debxo-lxde/packages
@@ -34,7 +34,7 @@ xfonts-100dpi
 xfonts-scalable
 xfonts-base
 x11-xserver-utils
-xinit
+nodm/lenny-backports
 xauth
 
 # the desktop stuff

diff --git a/configs/debxo-sugar/hooks b/configs/debxo-sugar/hooks
index 1daad432a89d0d490f0745f278c2695ce55c70a0..7e14625868df7326e99c1705d46abf37c61e5b69 100644 (file)
--- a/configs/debxo-sugar/hooks
+++ b/configs/debxo-sugar/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
 
        # configure sugar

diff --git a/configs/debxo-sugar/packages b/configs/debxo-sugar/packages
index 8238ff2e969b9f3960f03efd07eb7e17ea2774ee..71068634800e220be5ac9c14c45fa3d00648325f 100644 (file)
--- a/configs/debxo-sugar/packages
+++ b/configs/debxo-sugar/packages
@@ -35,7 +35,7 @@ xfonts-100dpi
 xfonts-scalable
 xfonts-base
 x11-xserver-utils
-xinit
+nodm/lenny-backports
 
 # the desktop stuff
 menu

diff --git a/configs/debxo-xfce/hooks b/configs/debxo-xfce/hooks
index 259119af85b77ee4e51da58d5211e3990d2a50a6..cb7406e647f5b777f454fc0e65a15bc2929abd1e 100644 (file)
--- a/configs/debxo-xfce/hooks
+++ b/configs/debxo-xfce/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
 
 }

diff --git a/configs/debxo-xfce/packages b/configs/debxo-xfce/packages
index 0bd35273f1e16a0fd18119aa95144fe76c625142..e86c5a7b287338c2bba84809cb565925f5861839 100644 (file)
--- a/configs/debxo-xfce/packages
+++ b/configs/debxo-xfce/packages
@@ -34,7 +34,7 @@ xfonts-100dpi
 xfonts-scalable
 xfonts-base
 x11-xserver-utils
-xinit
+nodm/lenny-backports
 xauth
 
 # the desktop stuff