Updated files from latest used to build LiveCD.

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

diff --git a/ChangeLog b/ChangeLog
index f18df004bb47b5304872cfc475157fec19480a0f..cee5e22aedbc96585e063dc46299d4501905335c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.318 2005/08/30 14:06:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.319 2005/08/30 14:45:25 wolf31o2 Exp $
+
+  30 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/files/README.txt, livecd/files/generic.motd.txt,
+  livecd/files/livecd.motd.txt, livecd/files/livecd-bashrc,
+  livecd/files/livecd-local.start:
+  Updated files from latest used to build LiveCD.
 
   30 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org> arch/x86.py:
   Added sse to HOSTUSE for athlon-xp, since it supports SSE instructions.

diff --git a/livecd/files/README.txt b/livecd/files/README.txt
index 0f052ff6dadd9d21079a166851ad153e16059baa..7729a7d109d74d4b7ee6ed7139f68ea86cfe8969 100644 (file)
--- a/livecd/files/README.txt
+++ b/livecd/files/README.txt
@@ -97,10 +97,12 @@ docache             This caches the entire runtime portion of the CD into RAM, which
                allows you to umount /mnt/cdrom and mount another CDROM.  This
                option requires that you have at least twice as much available
                RAM as the size of the CD.
+doload=X       This causes the initial ramdisk to load any module listed, as
+               well as dependencies.  Replace X with the module name.  Multiple
+               modules can be specified by a comma-separated list.
 noload=X       This causes the initial ramdisk to skip the loading of a
-               specific driver that may be causing a problem.  Replace X with
-               the driver name.  Multiple drivers can be specified by a
-               comma-separated list.
+               specific module that may be causing a problem.  Syntax matches
+               that of doload.
 nox            This causes an X-enabled LiveCD to not automatically start X,
                but rather, to drop to the command line instead.
 scandelay      This causes the CD to pause for 10 seconds during certain

diff --git a/livecd/files/generic.motd.txt b/livecd/files/generic.motd.txt
index d02e17dd2ebe35905e3b792d1a65d6e8ccb67adf..fb931d6c78b467d6518344f6d6cf059bc8029c44 100644 (file)
--- a/livecd/files/generic.motd.txt
+++ b/livecd/files/generic.motd.txt
@@ -1,11 +1,9 @@
-
 ##GREETING
 
 The root password on this system has been auto-scrambled for security.
 
 If any ethernet adapters were detected at boot, they should be auto-configured
 if DHCP is available on your network.  Type "net-setup eth0" to specify eth0 IP
-address settings by hand. 
+address settings by hand.
 
 Check /etc/kernels/kernel-config-* for kernel configuration(s).
-

diff --git a/livecd/files/livecd-bashrc b/livecd/files/livecd-bashrc
index a1fa24241da924f2550778dd9ade6933aaa4f024..85baa140f97d2a286a52663cf0c99d7377ca9a57 100644 (file)
--- a/livecd/files/livecd-bashrc
+++ b/livecd/files/livecd-bashrc
@@ -2,14 +2,13 @@
 
 if [ ! $(grep nox /proc/cmdline) ]
 then
-    if [ -x /usr/bin/X ]
-    then
-       if [ -e /etc/startx ]
+       if [ -x /usr/bin/X ]
        then
-           rm -f /etc/startx
-           ##STARTX
-           [ -f /etc/motd ] && cat /etc/motd
+               if [ -e /etc/startx ]
+               then
+                       rm -f /etc/startx
+                       ##STARTX
+                       [ -f /etc/motd ] && cat /etc/motd
+               fi
        fi
-    fi
 fi
-

diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start
index 29aff4f045515a8738b9c65d48a9693f32930e89..d4d7fe55e8ab423a14327110b55ecc4b93a1f731 100644 (file)
--- a/livecd/files/livecd-local.start
+++ b/livecd/files/livecd-local.start
@@ -23,4 +23,3 @@ if [ -d /usr/livecd/eclass ]
 then
        ln -sf /usr/livecd/eclass /usr/portage/eclass
 fi
-

diff --git a/livecd/files/livecd.motd.txt b/livecd/files/livecd.motd.txt
index f0b01608f89a320c282caa6f41b5616cbbbe2fa6..3a489e82bc679de83a833b957392be7f4c0a1242 100644 (file)
--- a/livecd/files/livecd.motd.txt
+++ b/livecd/files/livecd.motd.txt
@@ -1,4 +1,3 @@
-
 To (re)start X Windows, please type "startx" at the prompt below.
 
 Please report any bugs you find to http://bugs.gentoo.org. Be sure to include