From 728b602c0fc995c5bc2a901d7d7d01596fb78072 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 20 Apr 2005 21:14:35 +0000 Subject: [PATCH] Updated rc-update.sh with better defaults for different livecd/type settings and cleaning up file copying in livecd-stage2-controller.sh to match catalyst 1.1.9. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@616 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 9 ++++++++- .../livecd-stage2/livecd-stage2-controller.sh | 7 +++---- targets/support/rc-update.sh | 18 +++++++++++++----- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28376bfa..6e9a4f39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.228 2005/04/20 20:45:47 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.229 2005/04/20 21:14:35 wolf31o2 Exp $ + + 20 Apr 2005; Chris Gianelloni + targets/livecd-stage2/livecd-stage2-controller.sh, + targets/support/rc-update.sh: + Updated rc-update.sh with better defaults for different livecd/type settings + and cleaning up file copying in livecd-stage2-controller.sh to match + catalyst 1.1.9. 20 Apr 2005; Chris Gianelloni README: Made example of catalyst.conf in README match the default catalyst.conf diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index 36766430..a9e5ea6c 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.5 2005/04/20 19:48:29 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.6 2005/04/20 21:14:35 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -41,13 +41,12 @@ case $1 in fi # 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 - touch ${clst_chroot_path}/root/.bashrc cp ${clst_sharedir}/livecd/files/livecd-local.start \ ${clst_chroot_path}/etc/conf.d/local.start - cp ${clst_sharedir}/livecd/files/mkvardb \ - ${clst_chroot_path}/tmp mkdir -p /usr/share/faces cp ${clst_sharedir}/livecd/files/gentoo.png \ ${clst_chroot_path}/usr/share/faces diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh index 3532d7de..dcbc7334 100644 --- a/targets/support/rc-update.sh +++ b/targets/support/rc-update.sh @@ -24,12 +24,20 @@ then # Do some livecd_type specific rc-update changes case ${clst_livecd_type} in gentoo-gamecd ) - # we add spind to default here since we don't want the CD to spin down - rc-update add spind default - rc-update add x-setup default - ;; + rc-update add spind default + rc-update add x-setup default + ;; + gentoo-release-livecd ) + rc-update add spind default + rc-update add x-setup default + rc-update add xdm default + ;; + generic-livecd ) + rc-update add spind default + rc-update add x-setup default + ;; *) - ;; + ;; esac fi -- 2.26.2