I've modified the GDM configuration section to work correctly. I have also ensured...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1161 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 8d5068077bcc2cb6309525a0bcda4b105e6405bb..d40cdc7b61fdef4636a274f936e6cc6382c60274 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.645 2006/07/12 23:28:40 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.646 2006/07/19 21:39:46 wolf31o2 Exp $
+
+  19 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/livecdfs-update.sh:
+  I've modified the GDM configuration section to work correctly. I have also
+  ensured that xdm is no longer started just because livecd/xdm is used, which
+  was causing issues for the generic-livecd type. This is 2.0_rc50, which
+  should be the last of the 'release candidates' made. If there are no bug
+  reports in 2 days, then I'm rolling this as 2.0 final.
 
   12 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:

diff --git a/catalyst b/catalyst
index dfa095e3ed2af762ed1cd571f73f0cc9a81eeedb..b3f742e248b050ca6c7336ef4ba7f6e619d833b5 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python -OO
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.159 2006/07/12 18:34:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.160 2006/07/19 21:39:46 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -11,7 +11,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc49"
+__version__="2.0_rc50"
 
 conf_values={}
 

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 2e32bbe3975c15381266c820bd956f076653626b..ad346ceb53b61df0091e1ff4e76400606f6c529e 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.54 2006/07/12 23:28:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.55 2006/07/19 21:39:46 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
 update_env_settings
 
-# Allow root logins to the livecd by default
+# Allow root logins to our CD by default
 if [ -e /etc/sshd/sshd_config ]
 then
        sed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
@@ -36,6 +36,8 @@ echo 'DNSDOMAIN="gentoo"' >> /etc/conf.d/domainname
 # Add any users
 if [ -n "${clst_livecd_users}" ]
 then
+       first_user=$(echo ${clst_livecd_users} | cut -d' ' -f1)
+
        # Here we check to see if games exists for bug #125498
        if [ "$(getent group games | cut -d: -f1)" != "games" ]
        then
@@ -45,12 +47,12 @@ then
        for x in ${clst_livecd_users}
        do
                useradd -G users,wheel,audio,games,cdrom,usb -c "Default LiveCD User" \
-                       -m $x
+                       -m ${x}
                if [ -n "${clst_livecd_xdm}" -a -n "${clst_livecd_xsession}" ]
                then
-                       echo "[Desktop]" > /home/$x/.dmrc
-                       echo "Session=${clst_livecd_xsession}" >> /home/$x/.dmrc
-                       chown -R $x:users /home/$x
+                       echo "[Desktop]" > /home/${x}/.dmrc
+                       echo "Session=${clst_livecd_xsession}" >> /home/${x}/.dmrc
+                       chown -R ${x}:users /home/${x}
                fi
        done
 fi
@@ -122,7 +124,6 @@ if [ -n "${clst_livecd_xdm}" ]
 then
        sed -i "s:#DISPLAYMANAGER=\"xdm\":DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
                /etc/rc.conf
-       rc-update add xdm default
 fi
 
 # Setup configured default X Session
@@ -179,7 +180,7 @@ elif [ "${clst_livecd_splash_type}" == "gensplash" -a -n \
 then
        if [ -d /etc/splash/${clst_livecd_splash_theme} ]
        then
-               sed -i 's:# SPLASH_THEME="gentoo":SPLASH_THEME=\"${clst_livecd_splash_theme}\":' /etc/conf.d/splash
+               sed -i "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" /etc/conf.d/splash
                rm -f /etc/splash/default
                ln -s /etc/splash/${clst_livecd_splash_theme} /etc/splash/default
        else
@@ -273,19 +274,15 @@ case ${clst_livecd_type} in
                        then
                                if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ]
                                then
-                                       sedxtra="TimedLogin=${first_user}"
+                                       sedxtra="\nTimedLogin=${first_user}"
                                else
                                        sedxtra=""
                                fi
 
                                sed     -i \
-                                       -e 's:\(\[daemon\]\)$:\1\nTimedLoginEnable=true:' \
-                                       -e 's:^TimedLoginEnable=true$:\1\nTimedLoginDelay=10:' \
+                                       -e "s:\(\[daemon\]\)$:\1\nTimedLoginEnable=true\nTimedLoginDelay=10${sedxtra}:" \
                                        -e 's:\(\[greeter\]\)$:\1\nGraphicalTheme=gentoo-emergence:' \
                                        /etc/X11/gdm/custom.conf
-                               [ -n "${sedxtra}" ] && sed -i \
-                                       -e "s:^TimedLoginDelay=10$:\1\n${sedxtra}:" \
-                                       /etc/X11/gdm/custom.conf
                        else
                                cp -f /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm.conf.old
                                sed -i \
@@ -296,7 +293,6 @@ case ${clst_livecd_type} in
                                        -e 's:^GraphicalTheme=.*$:GraphicalTheme=gentoo-emergence:' \
                                        /etc/X11/gdm/gdm.conf
 
-
                                if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ]
                                then
                                        sed -i \
@@ -378,10 +374,10 @@ case ${clst_livecd_type} in
 esac
 
 # We want the first user to be used when auto-starting X
-if [ -n "${clst_livecd_users}" -a -e /etc/startx ]
+if [ -e /etc/startx ]
 then
-       first_user=$(echo ${clst_livecd_users} | cut -d' ' -f1)
-       sed -i "s/##STARTX/source /etc/profile && su - $first_user -c startx/" \
+       sed -i \
+               "s/##STARTX/source /etc/profile && su - ${first_user} -c startx/" \
                /root/.bashrc
 fi