Updated all instances of livecd/type: gentoo-release-environmental to gentoo-release...

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

diff --git a/ChangeLog b/ChangeLog
index ffbdf853530d06f4e234fcef28e4e5817c9e377c..d9c37a43ac995f5063f56c293ca587edfb4a23a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.224 2005/04/20 18:34:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.225 2005/04/20 19:48:29 wolf31o2 Exp $
+
+  20 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/livecd-stage1/livecd-stage1-controller.sh,
+  targets/livecd-stage2/livecd-stage2-controller.sh,
+  targets/support/livecdfs-update.sh:
+  Updated all instances of livecd/type: gentoo-release-environmental to
+  gentoo-release-livecd and added generic-livecd.
 
   20 Apr 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   examples/fsscript.sh.example, examples/gamecd.conf.example,

diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index c9d6334341c98bf4eb4e09aa0cccb3c43994bcf2..889726e8fb9eba32aaf5a5447620938af8a1aa7e 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.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/targets/livecd-stage1/livecd-stage1-controller.sh,v 1.4 2005/04/11 20:05:40 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-controller.sh,v 1.5 2005/04/20 19:48:29 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 
@@ -8,51 +8,7 @@
 
 case $1 in
        preclean)
-               # move over the motd (if applicable)
-               if [ -n "${clst_livecd_motd}" ]
-               then
-                       cp -a ${clst_livecd_motd} ${clst_chroot_path}/etc/motd
-               else
-                       cp -a ${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/environmental.motd.txt \
-                               ${clst_sharedir}/livecd/files/gamecd.motd.txt \
-                               ${clst_chroot_path}/etc
-               fi
-       
-               # move over the xinitrc (if applicable)
-               if [ -n "${clst_livecd_xinitrc}" ]
-               then
-                       cp -a ${clst_livecd_xinitrc} ${clst_chroot_path}/etc/X11/xinit/xinitrc
-               fi
-
-               # move over the environment
-               cp ${clst_sharedir}/livecd/files/livecd-bash_profile \
-                       ${clst_chroot_path}/root/.bash_profile
-               touch ${clst_chroot_path}/root/.bashrc
-               cp ${clst_sharedir}/livecd/files/livecd-local.start \
-                       ${clst_chroot_path}/etc/conf.d/local.start
-               cp ${clst_sharedir}/livecd/files/mkvardb \
-                       ${clst_chroot_path}/tmp
-               mkdir -p /usr/share/faces
-               cp ${clst_sharedir}/livecd/files/gentoo.png \
-                       ${clst_chroot_path}/usr/share/faces
-
-               # execute gamecdfs-update.sh if we're a gamecd
-               if [ "${clst_livecd_type}" = "gentoo-gamecd" ]
-               then
-                       if [ -n "${clst_gamecd_conf}" ]
-                       then
-                               cp ${clst_gamecd_conf} ${clst_chroot_path}/tmp/gamecd.conf
-                       else
-                               echo "gamecd/conf is required for a gamecd!"
-                               exit 1
-                       fi
-               fi
-               
-               # now, finalize and tweak the livecd fs (inside of the chroot)
-               exec_in_chroot  ${clst_sharedir}/targets/support/livecdfs-update.sh
+               echo "Cleared out by wolf31o2... this is a placeholder, BIATCH!!!"
                ;;
 
        rc-update)

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 9d8adb2bc48c3727d3ddafbd8f130d3b4ca2efb5..367664302df4a8bed24451aaba24ccb5ec99084b 100755 (executable)
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.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/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.4 2005/04/11 20:05:40 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.5 2005/04/20 19:48:29 wolf31o2 Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -29,7 +29,7 @@ case $1 in
                        cp -a ${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/environmental.motd.txt \
+                               ${clst_sharedir}/livecd/files/livecd.motd.txt \
                                ${clst_sharedir}/livecd/files/gamecd.motd.txt \
                                ${clst_chroot_path}/etc
                fi

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 8e305568c58df940fc6c6b083fd42cd6081082e1..8a18925c8cbff9244d1960f86373fa39cbeb9a8c 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/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/targets/support/livecdfs-update.sh,v 1.7 2005/04/11 20:05:40 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.8 2005/04/20 19:48:29 wolf31o2 Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -41,8 +41,13 @@ case ${clst_livecd_type} in
        gnap)
                echo "gentoo" > /etc/dnsdomainname
                echo "127.0.0.1 livecd.gentoo livecd localhost" > /etc/hosts
-       ;;
-       *)
+               ;;
+       gentoo-gamecd)
+               echo "gamecd" > /etc/hostname
+               echo "gentoo" > /etc/dnsdomainname
+               echo "127.0.0.1 gamecd.gentoo gamecd localhost" > /etc/hosts
+               ;;
+       gentoo-*)
                echo "livecd" > /etc/hostname
                echo "gentoo" > /etc/dnsdomainname
                echo "127.0.0.1 livecd.gentoo livecd localhost" > /etc/hosts
@@ -125,21 +130,18 @@ case ${clst_livecd_type} in
                cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd
                sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd
        ;;
-       gentoo-release-environmental )
+       gentoo-release-livecd )
                cat /etc/generic.motd.txt /etc/universal.motd.txt \
-                       /etc/minimal.motd.txt /etc/environmental.motd.txt > /etc/motd
-               sed -i 's:^##GREETING:Welcome to the Gentoo Linux LiveCD Environment!:' /etc/motd
+                       /etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd
+               sed -i 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' /etc/motd
        ;;
        gentoo-gamecd )
                cat /etc/generic.motd.txt /etc/gamecd.motd.txt > /etc/motd
                sed -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd
        ;;
-       * )
-               cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd
-               sed -i 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' /etc/motd
 esac
 
-rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/environmental.motd.txt /etc/gamecd.motd.txt
+rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt /etc/gamecd.motd.txt
 
 # setup splash/bootsplash (if called for)
 if [ "${clst_livecd_splash_type}" == "bootsplash" -a -n "${clst_livecd_splash_theme}" ]
@@ -204,7 +206,7 @@ case ${clst_livecd_type} in
 
                touch /etc/startx
        ;;
-       gentoo-release-environmental )
+       generic-livecd )
                touch /etc/startx
        ;;
 esac