mkext3/mkjffs2: rework fstab/olpc.fth file generation during image creation

[xodist] / configs / debxo-kde / hooks

diff --git a/configs/debxo-kde/hooks b/configs/debxo-kde/hooks
index 0af18b5de94f2ff821f31b8b0d60bfdcb298c24a..03a73baf29fa4cdeaaed12ad6bb14b59751e35ba 100644 (file)
--- 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
 
 }