Changed some copy commands to use -f, added a check for /etc/gconf before moving it when not using gentoo-release-livecd, and fixed a sed for root's .bashrc, as reported on the gentoo-catalyst mailing list by Luca Casagrande <luca.casagrande@gmail.com>.

3 files changed, 20 insertions, 12 deletions

diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog
index 617d439fbf..b0d736ad11 100644
--- a/src/catalyst/ChangeLog
+++ b/src/catalyst/ChangeLog
@@ -1,5 +1,13 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.657 2006/08/16 21:50:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.658 2006/08/22 16:45:47 wolf31o2 Exp $
+
+  22 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage2/livecd-stage2-controller.sh,
+  targets/support/livecdfs-update.sh:
+  Changed some copy commands to use -f, added a check for /etc/gconf before
+  moving it when not using gentoo-release-livecd, and fixed a sed for root's
+  .bashrc, as reported on the gentoo-catalyst mailing list by Luca Casagrande
+  <luca.casagrande@gmail.com>.
 
   16 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:
diff --git a/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh b/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh
index 60e30bf4f4..4bbc3e5549 100644
--- a/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/Attic/livecd-stage2-controller.sh,v 1.21 2006/04/20 15:17:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/Attic/livecd-stage2-controller.sh,v 1.22 2006/08/22 16:45:47 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
@@ -63,11 +63,11 @@ case $1 in
 		fi
 	
 		# move over the environment
-		cp ${clst_sharedir}/livecd/files/livecd-bashrc \
+		cp -f ${clst_sharedir}/livecd/files/livecd-bashrc \
 			${clst_chroot_path}/root/.bashrc
-		cp ${clst_sharedir}/livecd/files/livecd-bash_profile \
+		cp -f ${clst_sharedir}/livecd/files/livecd-bash_profile \
 			${clst_chroot_path}/root/.bash_profile
-		cp ${clst_sharedir}/livecd/files/livecd-local.start \
+		cp -f ${clst_sharedir}/livecd/files/livecd-local.start \
 			${clst_chroot_path}/etc/conf.d/local.start
 		
 		# execute copy gamecd.conf if we're a gamecd
@@ -75,7 +75,7 @@ case $1 in
 		then
 			if [ -n "${clst_gamecd_conf}" ]
 			then
-				cp ${clst_gamecd_conf} ${clst_chroot_path}/tmp/gamecd.conf
+				cp -f ${clst_gamecd_conf} ${clst_chroot_path}/tmp/gamecd.conf
 			else
 				echo "gamecd/conf is required for a gamecd!"
 				exit 1
diff --git a/src/catalyst/targets/support/livecdfs-update.sh b/src/catalyst/targets/support/livecdfs-update.sh
index c3b81ff867..dc643c6d67 100644
--- a/src/catalyst/targets/support/livecdfs-update.sh
+++ b/src/catalyst/targets/support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.60 2006/08/16 21:50:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.61 2006/08/22 16:45:47 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -336,11 +336,11 @@ case ${clst_livecd_type} in
 				for username in ${clst_livecd_users}
 				do
 					mkdir -p /home/${username}/Desktop
-					cp /usr/share/applications/installer-gtk.desktop \
+					cp -f /usr/share/applications/installer-gtk.desktop \
 						/home/${username}/Desktop
-					cp /usr/share/applications/installer-faq.desktop \
+					cp -f /usr/share/applications/installer-faq.desktop \
 						/home/${username}/Desktop
-					cp /usr/share/applications/installer-dialog.desktop \
+					cp -f /usr/share/applications/installer-dialog.desktop \
 						/home/${username}/Desktop
 					sed -i -e 's:Exec=installer-dialog:Exec=sudo installer-dialog:' \
 						/home/${username}/Desktop/installer-dialog.desktop
@@ -354,7 +354,7 @@ case ${clst_livecd_type} in
 	generic-livecd )
 		# This is my hack to reduce tmpfs usage
 		mkdir -p /usr/livecd
-		mv -f /etc/gconf /usr/livecd
+		[ -d /etc/gconf ] && mv -f /etc/gconf /usr/livecd
 		if [ -e /usr/livecd/grppkgs.txt ]
 		then
 			rm -f /usr/livecd/grppkgs.txt
@@ -382,7 +382,7 @@ esac
 if [ -e /etc/startx ]
 then
 	sed -i \
-		"s/##STARTX/source /etc/profile && su - ${first_user} -c startx/" \
+		"s:##STARTX:source /etc/profile && su - ${first_user} -c startx:" \
 		/root/.bashrc
 fi