Updated the LiveCD motd to tell the user to run the display manager again, rather...

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

diff --git a/ChangeLog b/ChangeLog
index 92014e1e54d91ff68bdf43280944550acc18f009..4ac1d7c515d5de7b4f16acf2d8dd024991a86c75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.566 2006/02/09 12:16:03 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.567 2006/02/09 15:09:17 wolf31o2 Exp $
+
+  09 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  livecd/files/livecd.motd.txt, targets/support/livecdfs-update.sh:
+  Updated the LiveCD motd to tell the user to run the display manager again,
+  rather than startx, while mentioning that startx is useful as a rescue X
+  session since it starts twm. This is catalyst 2.0_rc35.
 
   09 Feb 2006; Eric Edgar <rocket@gentoo.org> targets/support/create-iso.sh:
   Add hfs-hide options to mkisofs so macs boot

diff --git a/catalyst b/catalyst
index 709e55774cdbe722cc765e814b2ac492fe1119d2..f0126365688735a703392ed3354db02bfaf21395 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.142 2006/02/08 22:17:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.143 2006/02/09 15:09:18 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_rc34"
+__version__="2.0_rc35"
 
 conf_values={}
 

diff --git a/livecd/files/livecd.motd.txt b/livecd/files/livecd.motd.txt
index 3a489e82bc679de83a833b957392be7f4c0a1242..a8c32aa4ac6b943e1b58506bd0b5ee636b1bd63e 100644 (file)
--- a/livecd/files/livecd.motd.txt
+++ b/livecd/files/livecd.motd.txt
@@ -1,4 +1,5 @@
-To (re)start X Windows, please type "startx" at the prompt below.
+To (re)start X Windows, please type "##DISPLAY_MANAGER" at the prompt below.
+There is also a rescue session for X using twm if you simply use "startx".
 
 Please report any bugs you find to http://bugs.gentoo.org. Be sure to include
 detailed information about how to reproduce the bug you are reporting.

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 514a1aa135b4d18d5ebfad9836b01bc86c2d8df6..ff3689f793c31fd66325d7aeca77b161bff38f1a 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/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.35 2006/02/08 03:25:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.36 2006/02/09 15:09:18 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -157,7 +157,8 @@ case ${clst_livecd_type} in
        gentoo-release-livecd )
                cat /etc/generic.motd.txt \
                        /etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd
-               sed -i 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' /etc/motd
+               sed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \
+                       -e "s:##DISPLAY_MANAGER:${clst_livecd_xdm}:" /etc/motd
        ;;
        gentoo-gamecd )
                cat /etc/generic.motd.txt /etc/gamecd.motd.txt > /etc/motd