Added a new livecd-bash_profile that sources ~/.bashrc in case we're called from...

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

diff --git a/ChangeLog b/ChangeLog
index 7f052f29336cb406c4990e0fd644ab7a86991467..d56faac3fa867c382ef37edd9d4577f68c1bbd2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.196 2005/03/29 17:09:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.197 2005/03/29 18:53:32 wolf31o2 Exp $
+
+  29 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  +livecd/files/livecd-bash_profile, livecd/runscript/default-runscript.sh:
+  Added a new livecd-bash_profile that sources ~/.bashrc in case we're called
+  from an interactive shell.
 
   29 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   -livecd/files/livecd-bash_profile, +livecd/files/livecd-bashrc,

diff --git a/livecd/files/livecd-bash_profile b/livecd/files/livecd-bash_profile
new file mode 100644 (file)
index 0000000..9ec49d6
--- /dev/null
+++ b/livecd/files/livecd-bash_profile
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+#This file is sourced by bash when you log in interactively.
+[ -f ~/.bashrc ] && . ~/.bashrc

diff --git a/livecd/runscript/default-runscript.sh b/livecd/runscript/default-runscript.sh
index 669e32c66635582a11fa02cd9235ed57266e2189..5f71327fdf414593f34f56a3ed3e87effc0d83d5 100644 (file)
--- a/livecd/runscript/default-runscript.sh
+++ b/livecd/runscript/default-runscript.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/livecd/runscript/Attic/default-runscript.sh,v 1.24 2005/03/29 17:09:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.25 2005/03/29 18:53:32 wolf31o2 Exp $
 
 #return codes to be used by archscript
 die() {
@@ -143,6 +143,8 @@ case $1 in
                # move over the environment
                cp ${clst_sharedir}/livecd/files/livecd-bashrc \
                        ${clst_chroot_path}/root/.bashrc
+               cp ${clst_sharedir}/livecd/files/livecd-bash_profile \
+                       ${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