From e6f6785fc60a474038800e20dfce078a99084e19 Mon Sep 17 00:00:00 2001 From: James Cameron Date: Fri, 29 Aug 2008 16:34:22 +1000 Subject: [PATCH] Fix to gdm and kdm configuration to use correct username. --- initchroot.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/initchroot.sh b/initchroot.sh index aa67948..156def5 100755 --- a/initchroot.sh +++ b/initchroot.sh @@ -184,12 +184,12 @@ 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=olpc/' ${ROOT_DIR}/etc/kde3/kdm/kdmrc + 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 # 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=olpc_' ${ROOT_DIR}/etc/gdm/gdm.conf + sed -i "s_\[daemon\]_\[daemon\]\n\nGreeter=/usr/lib/gdm/gdmlogin\n\nAutomaticLoginEnable=true\n\nAutomaticLogin=${DEFUSER}_" ${ROOT_DIR}/etc/gdm/gdm.conf fi if [ -d ${ROOT_DIR}/etc/gconf/2 ]; then cat >${ROOT_DIR}/etc/gconf/2/local-defaults.path<