From bb1ab37e8e8f48390c61fbc186b390b8158b3b1b Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 2 Mar 2005 02:14:34 +0000 Subject: [PATCH] Moved portage profiles from livecd-local.start to unmerge.sh, since /usr is not writeable at boot. Removed -a from cp in default-runscript.sh to keep the copy from preserving permissions and also adding /usr/share/faces and default Gentoo icon. We'll see how the icon does for us. Removing serial init script, as it causes problems with the splash theme. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@549 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 13 ++++++++++++- livecd/files/gentoo.png | Bin 0 -> 17301 bytes livecd/files/livecd-local.start | 6 ------ livecd/runscript-support/livecdfs-update.sh | 3 ++- livecd/runscript/default-runscript.sh | 9 ++++++--- targets/livecd-stage2/unmerge.sh | 8 +++++++- 6 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 livecd/files/gentoo.png diff --git a/ChangeLog b/ChangeLog index 0d0fff61..b8909211 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.174 2005/02/28 23:40:38 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.175 2005/03/02 02:14:33 wolf31o2 Exp $ + + 01 Mar 2005; Chris Gianelloni + +livecd/files/gentoo.png, livecd/files/livecd-local.start, + livecd/runscript/default-runscript.sh, + livecd/runscript-support/livecdfs-update.sh, + targets/livecd-stage2/unmerge.sh: + Moved portage profiles from livecd-local.start to unmerge.sh, since /usr is + not writeable at boot. Removed -a from cp in default-runscript.sh to keep + the copy from preserving permissions and also adding /usr/share/faces and + default Gentoo icon. We'll see how the icon does for us. Removing serial + init script, as it causes problems with the splash theme. 28 Feb 2005; Chris Gianelloni targets/livecd-stage1/livecd-stage1.sh: diff --git a/livecd/files/gentoo.png b/livecd/files/gentoo.png new file mode 100644 index 0000000000000000000000000000000000000000..faafb4a8c73f933d211961b7544bffff5caf0a51 GIT binary patch literal 17301 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 ) -if [ -d /usr/livecd/profiles ] -then - mkdir -p /usr/portage/profiles - ln -sf /usr/livecd/profiles /usr/portage/profiles -fi - if [ -d /usr/livecd/gconf ] then ln -sf /usr/livecd/gconf /etc/gconf diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh index 973b9716..2c1c1e4c 100755 --- a/livecd/runscript-support/livecdfs-update.sh +++ b/livecd/runscript-support/livecdfs-update.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.31 2005/02/28 23:21:09 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.32 2005/03/02 02:14:34 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -23,6 +23,7 @@ rc-update del iptables default rc-update del netmount default rc-update add autoconfig default rc-update del keymaps +rc-update del serial rc-update del consolefont rc-update add modules default rc-update add pwgen default diff --git a/livecd/runscript/default-runscript.sh b/livecd/runscript/default-runscript.sh index 01515f64..4074486c 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.21 2005/02/28 23:21:09 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/default-runscript.sh,v 1.22 2005/03/02 02:14:34 wolf31o2 Exp $ #return codes to be used by archscript die() { @@ -141,11 +141,14 @@ case $1 in fi # move over the environment - cp -a ${clst_sharedir}/livecd/files/livecd-bash_profile \ + cp ${clst_sharedir}/livecd/files/livecd-bash_profile \ ${clst_chroot_path}/root/.bash_profile touch ${clst_chroot_path}/root/.bashrc - cp -a ${clst_sharedir}/livecd/files/livecd-local.start \ + 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 # touch /etc/startx if our livecd/type requires it if [ "${clst_livecd_type}" = "gentoo-gamecd" ] #\ diff --git a/targets/livecd-stage2/unmerge.sh b/targets/livecd-stage2/unmerge.sh index 74842472..ab51c1cd 100644 --- a/targets/livecd-stage2/unmerge.sh +++ b/targets/livecd-stage2/unmerge.sh @@ -1,8 +1,14 @@ # 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/Attic/unmerge.sh,v 1.6 2004/11/23 00:02:57 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/Attic/unmerge.sh,v 1.7 2005/03/02 02:14:34 wolf31o2 Exp $ ${clst_CHROOT} ${clst_chroot_path} /bin/bash << EOF EMERGE_WARNING_DELAY=0 emerge -C $* EOF +if [ -d /usr/livecd/profiles ] +then + mkdir -p /usr/portage/profiles + ln -sf /usr/livecd/profiles /usr/portage/profiles +fi + exit 0 -- 2.26.2