Made sure that livecd/motd is ignored for livecd/type: gentoo-* and added some extra...

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

diff --git a/ChangeLog b/ChangeLog
index 803fc27fdbdf505279011a41204b0ab036c255f1..d37ef0b559779c9920c6e184d2944d22e32e27f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.586 2006/03/16 19:33:26 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.587 2006/03/22 19:05:39 wolf31o2 Exp $
+
+  22 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage2/livecd-stage2-controller.sh,
+  targets/support/livecdfs-update.sh:
+  Made sure that livecd/motd is ignored for livecd/type: gentoo-* and added
+  some extra cleanup to generic-livecd.
 
   16 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   -livecd/cdtar/yaboot-1.3.11-cdtar.tar.bz2,

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 8bd5c4de66bac23ee9d6b9dcbb54f02fea436b61..2142f3edb3b3ed264b662fecc3950e018a6341a3 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.18 2005/12/16 19:32:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.19 2006/03/22 19:05:40 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
@@ -36,7 +36,22 @@ case $1 in
                # Move over the motd (if applicable)
                if [ -n "${clst_livecd_motd}" ]
                then
-                       cp -pPR ${clst_livecd_motd} ${clst_chroot_path}/etc/motd
+                       case ${clst_livecd_type} in
+                               gentoo-*)
+                                       echo "Using livecd/motd is not supported with livecd/type"
+                                       echo "${clst_livecd_type}. You should switch to using"
+                                       echo "generic-livecd instead."
+                                       cp -pPR ${clst_sharedir}/livecd/files/generic.motd.txt \
+                                               ${clst_sharedir}/livecd/files/universal.motd.txt \
+                                               ${clst_sharedir}/livecd/files/minimal.motd.txt \
+                                               ${clst_sharedir}/livecd/files/livecd.motd.txt \
+                                               ${clst_sharedir}/livecd/files/gamecd.motd.txt \
+                                               ${clst_chroot_path}/etc
+                               ;;
+                               *)
+                                       cp -pPR ${clst_livecd_motd} ${clst_chroot_path}/etc/motd
+                               ;;
+                       esac
                else
                        cp -pPR ${clst_sharedir}/livecd/files/generic.motd.txt \
                                ${clst_sharedir}/livecd/files/universal.motd.txt \

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index fb75ef02b78540f9d7d44651a1f8844b6f0c47ab..62925c9e70fc97881ed99e10a121eb9d255f2bdb 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/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.40 2006/03/13 16:33:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.41 2006/03/22 19:05:40 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -344,6 +344,14 @@ case ${clst_livecd_type} in
                # This is my hack to reduce tmpfs usage
                mkdir -p /usr/livecd
                mv -f /etc/gconf /usr/livecd
+               if [ -e /usr/livecd/grppkgs.txt ]
+               then
+                       rm -f /usr/livecd/grppkgs.txt
+               fi
+               if [ -e /usr/livecd/kernelpkgs.txt ]
+               then
+                       rm -f /usr/livecd/kernelpkgs.txt
+               fi
 
                touch /etc/startx
                ;;