From f896f5dac646ef02091432c92d043cc6a5a93056 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 9 Feb 2006 15:09:18 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1081 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 +++++++- catalyst | 4 ++-- livecd/files/livecd.motd.txt | 3 ++- targets/support/livecdfs-update.sh | 5 +++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92014e1e..4ac1d7c5 100644 --- 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 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 targets/support/create-iso.sh: Add hfs-hide options to mkisofs so macs boot diff --git a/catalyst b/catalyst index 709e5577..f0126365 100755 --- 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 @@ -11,7 +11,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__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 3a489e82..a8c32aa4 100644 --- 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 514a1aa1..ff3689f7 100755 --- 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 -- 2.26.2