diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-09 21:57:45 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-07-09 21:57:45 +0000 |
| commit | 24b0551d7fa157e0297703f0f5ca60a54db92cba (patch) | |
| tree | e0bc66865d4ef17bd25a413dff8cc0843d910d4d | |
| parent | Changed mount check to not use /proc for non-Linux systems. Blame agaffney. (diff) | |
| download | gentoo-24b0551d7fa157e0297703f0f5ca60a54db92cba.tar.gz gentoo-24b0551d7fa157e0297703f0f5ca60a54db92cba.tar.bz2 gentoo-24b0551d7fa157e0297703f0f5ca60a54db92cba.zip | |
Added nox support to bashrc and added nox to README.txt information.
| -rw-r--r-- | src/catalyst/ChangeLog | 6 | ||||
| -rw-r--r-- | src/catalyst/livecd/files/README.txt | 2 | ||||
| -rw-r--r-- | src/catalyst/livecd/files/livecd-bashrc | 15 |
3 files changed, 17 insertions, 6 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog index 19574b99a9..f362e67920 100644 --- a/src/catalyst/ChangeLog +++ b/src/catalyst/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.91 2005/07/09 21:48:00 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.92 2005/07/09 21:57:45 wolf31o2 Exp $ + + 09 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> + livecd/files/README.txt, livecd/files/livecd-bashrc: + Added nox support to bashrc and added nox to README.txt information. 09 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> modules/catalyst_support.py: diff --git a/src/catalyst/livecd/files/README.txt b/src/catalyst/livecd/files/README.txt index 0ae9d318ee..0f052ff6da 100644 --- a/src/catalyst/livecd/files/README.txt +++ b/src/catalyst/livecd/files/README.txt @@ -101,6 +101,8 @@ 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. +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 portions the boot process to allow for devices that are slow to initialize to be ready for use. diff --git a/src/catalyst/livecd/files/livecd-bashrc b/src/catalyst/livecd/files/livecd-bashrc index 3c823af194..67eb5f85f8 100644 --- a/src/catalyst/livecd/files/livecd-bashrc +++ b/src/catalyst/livecd/files/livecd-bashrc @@ -1,9 +1,14 @@ #!/bin/bash -if [ -x /usr/bin/X ]; then - if [ -e /etc/startx ]; then - rm -f /etc/startx - ##STARTX - cat /etc/motd +if [ ! $(grep nox /proc/cmdline) ] +then + if [ -x /usr/bin/X ] + then + if [ -e /etc/startx ] + then + rm -f /etc/startx + ##STARTX + cat /etc/motd + fi fi fi |