Moved portage profiles from livecd-local.start to unmerge.sh, since /usr is not write...

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

diff --git a/ChangeLog b/ChangeLog
index 0d0fff61fb938ef3561f796cb9faa2d8e22705c8..b89092119c1cd6124de51abcac16e430007e02d7 100644 (file)
--- 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 <wolf31o2@gentoo.org>
+  +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 <wolf31o2@gentoo.org>
   targets/livecd-stage1/livecd-stage1.sh:

diff --git a/livecd/files/gentoo.png b/livecd/files/gentoo.png
new file mode 100644 (file)
index 0000000..faafb4a
Binary files /dev/null and b/livecd/files/gentoo.png differ

diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start
index a70733d85df7e4b207d170a61fa2040c83bd530c..e98ab087386088cf9fc6fa886fb7d0d6bf04da71 100644 (file)
--- a/livecd/files/livecd-local.start
+++ b/livecd/files/livecd-local.start
@@ -3,12 +3,6 @@
 # This is a good place to load any misc.
 # programs on startup ( 1>&2 )
 
-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 973b9716bd6fed1e1774858e9e73abdcdb891e25..2c1c1e4c8954322e0225e877f6496c401de36a2c 100755 (executable)
--- 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 01515f647388bb9b6f544012cda4dc019d99fa8d..4074486c6c4623cc02114b96563be1d5a943806c 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.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 748424728c2d09a1edb0bec12bb475c769bc9ada..ab51c1cdb58513868e24309e10f87817f8b0c6f4 100644 (file)
--- 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