From: Chris Gianelloni Date: Thu, 9 Jun 2005 17:42:05 +0000 (+0000) Subject: Removed gentoo.png and creation of face directory. Changed livecd-bash_profile to... X-Git-Tag: CATALYST_2_0_6_916~726 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7c744551a84f8d484791355a8057f68457e4a12d;p=catalyst.git Removed gentoo.png and creation of face directory. Changed livecd-bash_profile to source root's .bashrc. Sync motd files with catalyst 1.1.10_pre4. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@678 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 056cf7d4..0f641bb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.267 2005/06/02 20:30:59 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.268 2005/06/09 17:42:05 wolf31o2 Exp $ + + 09 Jun 2005; Chris Gianelloni + -livecd/files/README.txt, -livecd/files/environmental.motd.txt, + -livecd/files/gentoo.png, +livecd/files/livecd.motd.txt, + livecd/files/livecd-bash_profile, livecd/files/livecd-bashrc, + livecd/files/minimal.motd.txt, livecd/files/universal.motd.txt, + targets/livecd-stage2/livecd-stage2-controller.sh: + Removed gentoo.png and creation of face directory. Changed + livecd-bash_profile to source root's .bashrc. Sync motd files with catalyst + 1.1.10_pre4. 02 Jun 2005; Chris Gianelloni targets/stage1/stage1-preclean-chroot.sh, diff --git a/livecd/files/README.txt b/livecd/files/README.txt deleted file mode 100644 index 1f2682a6..00000000 --- a/livecd/files/README.txt +++ /dev/null @@ -1,26 +0,0 @@ -##GREETING - -We hope to provide you with the best experience possible, so if you have any -questions regarding the installation process, Gentoo in general, or simply want -to become an active part of the Gentoo community, please feel free to utilize -the following resources: - -IRC: irc.freenode.net, #gentoo - -Mailing Lists: Please see our quick Mailing List HOWTO at: - - -Gentoo user forums: - -Gentoo Bug Database: - -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 -typing either 'irssi' or 'links $url'. - -Don't forget to check out the Gentoo Installation Handbook, available both on -the LiveCD and the Web. On this LiveCD, the Handbook can be found at -'/mnt/cdrom/docs/handbook', and the latest version of the Handbook is viewable at the -following URL: . - -Thank you again for choosing Gentoo! diff --git a/livecd/files/gentoo.png b/livecd/files/gentoo.png deleted file mode 100644 index faafb4a8..00000000 Binary files a/livecd/files/gentoo.png and /dev/null differ diff --git a/livecd/files/livecd-bash_profile b/livecd/files/livecd-bash_profile index 4fc919bf..cebe8ca2 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 ]] && source ~/.bashrc diff --git a/livecd/files/livecd-bashrc b/livecd/files/livecd-bashrc index 8e9ba6b2..dc01009c 100644 --- a/livecd/files/livecd-bashrc +++ b/livecd/files/livecd-bashrc @@ -3,8 +3,7 @@ if [ -e /usr/bin/X ]; then if [ -e /etc/startx ]; then rm -f /etc/startx - export BASHRC_READ=1 - #startx + startx cat /etc/motd fi fi diff --git a/livecd/files/environmental.motd.txt b/livecd/files/livecd.motd.txt similarity index 100% rename from livecd/files/environmental.motd.txt rename to livecd/files/livecd.motd.txt diff --git a/livecd/files/minimal.motd.txt b/livecd/files/minimal.motd.txt index 7682082e..5b3f909d 100644 --- a/livecd/files/minimal.motd.txt +++ b/livecd/files/minimal.motd.txt @@ -1,10 +1,12 @@ -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 403b8729..51b2fde8 100644 --- a/livecd/files/universal.motd.txt +++ b/livecd/files/universal.motd.txt @@ -1,5 +1,3 @@ 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". diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index ff81df28..7973d409 100755 --- a/targets/livecd-stage2/livecd-stage2-controller.sh +++ b/targets/livecd-stage2/livecd-stage2-controller.sh @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.10 2005/05/25 19:15:17 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.11 2005/06/09 17:42:05 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -46,9 +46,6 @@ case $1 in ${clst_chroot_path}/root/.bash_profile cp ${clst_sharedir}/livecd/files/livecd-local.start \ ${clst_chroot_path}/etc/conf.d/local.start - mkdir -p /usr/share/faces - cp ${clst_sharedir}/livecd/files/gentoo.png \ - ${clst_chroot_path}/usr/share/faces # execute copy gamecd.conf if we're a gamecd if [ "${clst_livecd_type}" = "gentoo-gamecd" ]