From f9f3d1a79e06da708febe782e5fb5db52b889e79 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 29 Mar 2005 18:53:32 +0000 Subject: [PATCH] Added a new livecd-bash_profile that sources ~/.bashrc in case we're called from an interactive shell. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@571 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- livecd/files/livecd-bash_profile | 4 ++++ livecd/runscript/default-runscript.sh | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 livecd/files/livecd-bash_profile diff --git a/ChangeLog b/ChangeLog index 7f052f29..d56faac3 100644 --- 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 + +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 -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 index 00000000..9ec49d6b --- /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 669e32c6..5f71327f 100644 --- 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 -- 2.26.2