Fixed livecd/readme functionality, as reported to gentoo-catalyst mailing list by...

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

diff --git a/ChangeLog b/ChangeLog
index b48bb76b21a90ff3135dcfacc33c25533de6d9ed..ddc84cdd440ca4573a0ba2dbd98ca714a59385de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.376 2005/11/13 13:47:35 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.377 2005/11/14 19:20:30 wolf31o2 Exp $
+
+  14 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage2/livecd-stage2-controller.sh:
+  Fixed livecd/readme functionality, as reported to gentoo-catalyst mailing
+  list by Paul Kessler <kessler@co.wabasha.mn.us> and forward-ported copying
+  of Getting_Online.txt from catalyst 1.1.10.10.
 
   11 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> AUTHORS:
   Added Joshua Kinard to authors for his mips contributions.

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 2237f74d2080c5bd1696195a87826856a2569892..9879cb6b0ab7e8adf7426571c3830cf933f94bdd 100755 (executable)
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/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/livecd-stage2-controller.sh,v 1.14 2005/10/17 19:01:06 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.15 2005/11/14 19:20:30 wolf31o2 Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -74,7 +74,7 @@ case $1 in
                # this is moved here, so we can override any default xinitrc
                if [ -n "${clst_livecd_xinitrc}" ]
                then
-                       cp -a ${clst_livecd_xinitrc} ${clst_chroot_path}/etc/X11/xinit/xinitrc
+                       cp -f ${clst_livecd_xinitrc} ${clst_chroot_path}/etc/X11/xinit/xinitrc
                fi
                ;;
        rc-update)
@@ -93,8 +93,21 @@ case $1 in
                # Here is where we poke in our identifier
                touch $1/livecd
                
-               # Here we copy our nifty README.txt
-               cp ${clst_sharedir}/livecd/files/README.txt ${clst_cdroot_path}
+               # move over the readme (if applicable)
+               if [ -n "${clst_livecd_readme}" ]
+               then
+                       cp -f ${clst_livecd_readme} $1/README.txt
+               else
+                       cp -f ${clst_sharedir}/livecd/files/README.txt $1
+               fi
+
+               # move over Getting_Online.txt for minimal/GameCD
+               if [ "${clst_livecd_type}" = "gentoo-gamecd" ] \
+               || [ "${clst_livecd_type}" = "gentoo-release-minimal" ] \
+               || [ "${clst_livecd_type}" = "gentoo-release-livecd" ]
+               then
+                       cp -f ${clst_sharedir}/livecd/files/Getting_Online.txt $1
+               fi
                
                ${clst_sharedir}/targets/support/bootloader-setup.sh $1
                ;;