From 28373352d4067e47108a9bd01b25402477f0162d Mon Sep 17 00:00:00 2001
From: Andres Salomon <dilinger@collabora.co.uk>
Date: Thu, 10 Sep 2009 23:51:40 -0400
Subject: [PATCH] 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>
---
configs/debxo-awesome/hooks | 14 ++++++--------
configs/debxo-awesome/packages | 2 +-
configs/debxo-lxde/hooks | 14 ++++++--------
configs/debxo-lxde/packages | 2 +-
configs/debxo-sugar/hooks | 14 ++++++--------
configs/debxo-sugar/packages | 2 +-
configs/debxo-xfce/hooks | 14 ++++++--------
configs/debxo-xfce/packages | 2 +-
8 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/configs/debxo-awesome/hooks b/configs/debxo-awesome/hooks
index d1cc47e..100e635 100644
--- 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 ec02a7b..a924dc6 100644
--- 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 d1cc47e..100e635 100644
--- 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 ca1b80a..5299a99 100644
--- 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 1daad43..7e14625 100644
--- 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 8238ff2..7106863 100644
--- 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 259119a..cb7406e 100644
--- 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 0bd3527..e86c5a7 100644
--- 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
--
2.39.5