Don't copy motd files if we're using livecd/type generic-livecd.

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

diff --git a/ChangeLog b/ChangeLog
index d37ef0b559779c9920c6e184d2944d22e32e27f7..aa8f09cb39e0debcafdb5dcabb9a9c578ebb04d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.587 2006/03/22 19:05:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.588 2006/03/22 19:11:24 wolf31o2 Exp $
+
+  22 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage2/livecd-stage2-controller.sh:
+  Don't copy motd files if we're using livecd/type generic-livecd.
 
   22 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/livecd-stage2/livecd-stage2-controller.sh,

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 2142f3edb3b3ed264b662fecc3950e018a6341a3..5f707dfb616c93973f5f3bb20571ded29f74298f 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.19 2006/03/22 19:05:40 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.20 2006/03/22 19:11:24 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
@@ -52,7 +52,8 @@ case $1 in
                                        cp -pPR ${clst_livecd_motd} ${clst_chroot_path}/etc/motd
                                ;;
                        esac
-               else
+               elif [ "${clst_livecd_type}" != "generic-livecd" ]
+               then
                        cp -pPR ${clst_sharedir}/livecd/files/generic.motd.txt \
                                ${clst_sharedir}/livecd/files/universal.motd.txt \
                                ${clst_sharedir}/livecd/files/minimal.motd.txt \