Changed maintainers. Updated examples/fsscript.sh.example to provide better documentation. Lots of minor cosmetic updates. Updated minimal.motd.txt and universal.motd.txt to resolve documentation issue on bug #86914. Added x-setup to default runlevel on gamecd builds. Removed extranneous bashlogin sed-fu from livecdfs-update.sh and made default timezone UTC rather than GMT.

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

5 files changed, 9 insertions, 8 deletions

diff --git a/livecd/files/README.txt b/livecd/files/README.txt
index d8e385fa..1f2682a6 100644
--- a/livecd/files/README.txt
+++ b/livecd/files/README.txt
@@ -12,7 +12,7 @@ Mailing Lists: Please see our quick Mailing List HOWTO at:
 
 Gentoo user forums: <http://forums.gentoo.org>
 
-Gentoo Bug Database <http://bugs.gentoo.org>
+Gentoo Bug Database: <http://bugs.gentoo.org>
 
 On this LiveCD, we've provided a minimal IRC client called "irssi" and a simple
 text web browser called "links." Both can be accessed via the command line by
diff --git a/livecd/files/livecd-bash_profile b/livecd/files/livecd-bash_profile
index 9ec49d6b..4fc919bf 100644
--- a/livecd/files/livecd-bash_profile
+++ b/livecd/files/livecd-bash_profile
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 #This file is sourced by bash when you log in interactively.
-[ -f ~/.bashrc ] && . ~/.bashrc
+[[ -f ~/.bashrc ]] && . ~/.bashrc
diff --git a/livecd/files/livecd-bashrc b/livecd/files/livecd-bashrc
index c904ed8d..8e9ba6b2 100644
--- a/livecd/files/livecd-bashrc
+++ b/livecd/files/livecd-bashrc
@@ -1,9 +1,10 @@
 #!/bin/bash
 
-if [ -e /usr/X11R6/bin/X ]; then
+if [ -e /usr/bin/X ]; then
 	if [ -e /etc/startx ]; then
 		rm -f /etc/startx
-		startx
+		export BASHRC_READ=1
+		#startx
 		cat /etc/motd
 	fi
 fi
diff --git a/livecd/files/minimal.motd.txt b/livecd/files/minimal.motd.txt
index 5b3f909d..7682082e 100644
--- a/livecd/files/minimal.motd.txt
+++ b/livecd/files/minimal.motd.txt
@@ -1,12 +1,10 @@
+The latest version of the Handbook is always available from the Gentoo web site
+by typing "links http://www.gentoo.org/doc/en/handbook/handbook.xml".
 
 To start an ssh server on this system, type "/etc/init.d/sshd start".  If you
 need to log in remotely as root, type "passwd root" to reset root's password 
 to a known value.
 
-View installation instructions by typing "links /mnt/cdrom/docs/handbook/html/index.html" 
-or "links http://www.gentoo.org/doc/en/handbook/handbook.xml"
-for the latest version from the gentoo.org web site.
-
 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.
 Thank you for using Gentoo Linux!
diff --git a/livecd/files/universal.motd.txt b/livecd/files/universal.motd.txt
index 51b2fde8..403b8729 100644
--- a/livecd/files/universal.motd.txt
+++ b/livecd/files/universal.motd.txt
@@ -1,3 +1,5 @@
 
 Stage tarball(s), distfiles and packages can be found in /mnt/cdrom/.
 
+You can view the networkless installation instructions for this release by
+typing "links /mnt/cdrom/docs/handbook/html".