Made sure we use -f on removing the default links for splash. Removed check_portage_...

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

diff --git a/ChangeLog b/ChangeLog
index 58d3cb294a5790713d8834e8b1707da0be05093e..3614a983087954bae677ce698652b818410c7b89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.446 2005/12/09 17:26:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.447 2005/12/09 19:03:07 wolf31o2 Exp $
+
+  09 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh,
+  targets/livecd-stage1/livecd-stage1-chroot.sh,
+  targets/netboot/netboot-chroot.sh, targets/netboot/netboot-combine.sh,
+  targets/stage1/stage1-chroot.sh, targets/stage3/stage3-chroot.sh,
+  targets/stage4/stage4-chroot.sh, targets/support/chroot-functions.sh,
+  targets/support/kmerge.sh, targets/support/livecdfs-update.sh,
+  targets/support/unmerge.sh:
+  Made sure we use -f on removing the default links for splash. Removed
+  check_portage_version as it really isn't needed anymore. Removed
+  --no-install from genkernel commands in kmerge.sh so users must manually
+  remove kernels from /boot. This is 2.0_rc8.
 
   09 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:

diff --git a/catalyst b/catalyst
index 4205eedc48ead96a0e0fb28c207955a4fbc16617..71e5e1170d677903e2f81da626306ce79e09735b 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.111 2005/12/08 14:48:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.112 2005/12/09 19:03:07 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -10,7 +10,7 @@
 import os,sys,imp,string,getopt
 import pdb
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc7"
+__version__="2.0_rc8"
 
 conf_values={}
 

diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
index 429365a67cfad230306e74c4ad626a8df65279e0..63429ed0617e6143b07b4e56011ec906a6c2bce5 100755 (executable)
--- a/targets/embedded/embedded-chroot.sh
+++ b/targets/embedded/embedded-chroot.sh
@@ -1,12 +1,10 @@
 #!/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/embedded/embedded-chroot.sh,v 1.18 2005/12/08 15:16:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.19 2005/12/09 19:03:07 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
-check_portage_version
-
 update_env_settings
 
 setup_myfeatures

diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index 39e223b56660128e7da47697bc27dd6a93b4098a..99f18c0ac94e3f2a06cb13a6da8286b9cdaed513 100755 (executable)
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.sh
@@ -1,13 +1,10 @@
 #!/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/grp/grp-chroot.sh,v 1.23 2005/12/08 15:16:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.24 2005/12/09 19:03:07 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
-# check portage version in seed stage
-check_portage_version
-
 update_env_settings
 
 [ -f /tmp/envscript ] && source /tmp/envscript

diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index fc00cd131ad242f7da0bb3656d459d02913551fd..b668cabac22ad15ad7c90d474716032ac210d33c 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh
@@ -1,11 +1,10 @@
 #!/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/livecd-stage1/livecd-stage1-chroot.sh,v 1.21 2005/12/08 15:16:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.22 2005/12/09 19:03:07 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
-check_portage_version
 update_env_settings
 
 setup_myfeatures

diff --git a/targets/netboot/netboot-chroot.sh b/targets/netboot/netboot-chroot.sh
index 6bc377403f2825999b8e2c903823e0506db82708..7a888194ab012a937204ed941368ea472ddc364f 100755 (executable)
--- a/targets/netboot/netboot-chroot.sh
+++ b/targets/netboot/netboot-chroot.sh
@@ -1,12 +1,11 @@
 #!/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/netboot/netboot-chroot.sh,v 1.3 2005/12/08 15:16:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/netboot-chroot.sh,v 1.4 2005/12/09 19:03:07 wolf31o2 Exp $
 . /tmp/chroot-functions.sh
 
 update_env_settings
 
-check_portage_version
 setup_myfeatures
 setup_myemergeopts
 

diff --git a/targets/netboot/netboot-combine.sh b/targets/netboot/netboot-combine.sh
index 7d24bd29db72800e11bd016911d9a41b6ec14454..a7b275439df88afd3eb5ffe94833343513abdcfb 100644 (file)
--- a/targets/netboot/netboot-combine.sh
+++ b/targets/netboot/netboot-combine.sh
@@ -1,14 +1,14 @@
 #!/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/netboot/netboot-combine.sh,v 1.5 2005/11/30 21:34:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/netboot-combine.sh,v 1.6 2005/12/09 19:03:07 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/chroot-functions.sh
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
 update_env_settings
-check_portage_version
+
 setup_myfeatures
 setup_myemergeopts
 

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 4ce3a658607e16a339e1ccc41a8a11ac267584dd..26e92507827340c095129990fd1c1b22b7d803e7 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -1,13 +1,11 @@
 #!/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/stage1/stage1-chroot.sh,v 1.39 2005/12/08 15:16:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.40 2005/12/09 19:03:07 wolf31o2 Exp $
        
 
 . /tmp/chroot-functions.sh
 
-check_portage_version
-
 update_env_settings
 #setup_gcc
 

diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index a6828631f60122af0c1e9cc1ad64b54c63439be9..367236f45da5d7462e809c0c2387578228967746 100755 (executable)
--- a/targets/stage3/stage3-chroot.sh
+++ b/targets/stage3/stage3-chroot.sh
@@ -1,10 +1,9 @@
 #!/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/stage3/stage3-chroot.sh,v 1.24 2005/12/08 15:16:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.25 2005/12/09 19:03:07 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
-check_portage_version
 
 update_env_settings
 

diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
index 5bd3848c4cf5deea85cbbfe22fb33bfa8dc1f2be..4e50362754b973ffde884354c63bea3921fcb8a6 100755 (executable)
--- a/targets/stage4/stage4-chroot.sh
+++ b/targets/stage4/stage4-chroot.sh
@@ -4,7 +4,6 @@
 
 . /tmp/chroot-functions.sh
 
-check_portage_version
 update_env_settings
 
 setup_myfeatures

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index a6931a57ed73ae95e46d6bb8d70ebba8baa4f8f7..b11f822bd3efa7aaf3a7e49d91df78715433caa1 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -13,18 +13,6 @@ trap "echo SIGKILL signal recieved killing $0 with pid $$;kill -9 $$" SIGKILL
 #      * kernel recognizes this and generates SIGINT signal
 trap "echo SIGINT signal recieved killing $0 with pid $$;kill -9 $$" SIGINT
  
-check_portage_version(){
-       portage_version=`/usr/lib/portage/bin/portageq best_version / \
-               sys-apps/portage | cut -d/ -f2 | cut -d- -f2,3`
-       if [ -n "${portage_version}" -a `echo ${portage_version} | cut -d- -f1 \
-               | cut -d. -f3` -lt '51' ]
-       then
-               echo "ERROR: Your portage version is too low in your seed stage.  Portage version"
-               echo "2.0.51 or greater is required."
-               exit 1
-       fi
-}
-
 check_genkernel_version(){
        if [ -x /usr/bin/genkernel ]
        then

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 13a9f9fe810add2ff0d40c615ef5b4540cf9bd22..48b5d7a0e3b4875bc05d060d87a4f24355391f97 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -14,7 +14,6 @@ setup_gk_args() {
                         ${clst_kernel_gk_kernargs} \
                         --cachedir=/usr/portage/packages/gk_binaries/${clst_kname}-genkernel_cache-${clst_version_stamp} \
                         --no-mountboot \
-                        --no-install \
                         --kerneldir=/usr/src/linux \
                         --kernel-config=/var/tmp/${clst_kname}.config \
                         --modulespackage=/usr/portage/packages/gk_binaries/${clst_kname}-modules-${clst_version_stamp}.tar.bz2 \

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index badf2f215d8993fe80ee5bc319520af99a8982dd..aff6a525eb1b99318bc2d4a0d08a28691f31ec06 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.29 2005/12/09 17:26:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.30 2005/12/09 19:03:07 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 update_env_settings
@@ -169,7 +169,7 @@ then
        if [ -d /etc/bootsplash/${clst_livecd_splash_theme} ]
        then
                sed -i 's:BOOTSPLASH_THEME=\"gentoo\":BOOTSPLASH_THEME=\"${clst_livecd_splash_theme}\":' /etc/conf.d/bootsplash
-               rm /etc/bootsplash/default
+               rm -f /etc/bootsplash/default
                ln -s "/etc/bootsplash/${clst_livecd_splash_theme}" /etc/bootsplash/default
        else
                echo "Error, cannot setup bootsplash theme ${clst_livecd_splash_theme}"
@@ -181,7 +181,7 @@ then
        if [ -d /etc/splash/${clst_livecd_splash_theme} ]
        then
                sed -i 's:# SPLASH_THEME="gentoo":SPLASH_THEME=\"${clst_livecd_splash_theme}\":' /etc/conf.d/splash
-               rm /etc/splash/default
+               rm -f /etc/splash/default
                ln -s /etc/splash/${clst_livecd_splash_theme} /etc/splash/default
        else
                echo "Error, cannot setup splash theme ${clst_livecd_splash_theme}"

diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
index ee4a4b9eee00c27f34f7fe8dd5335f08fe4abcbb..5dc4d5be7bb51a5420ebdc1a91cb113f2bf3f85d 100644 (file)
--- a/targets/support/unmerge.sh
+++ b/targets/support/unmerge.sh
@@ -1,11 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/unmerge.sh,v 1.1 2005/12/08 15:16:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/unmerge.sh,v 1.2 2005/12/09 19:03:07 wolf31o2 Exp $
 
 
 source /tmp/chroot-functions.sh
 
-check_portage_version
 update_env_settings
 
 run_emerge -C "${clst_packages}"