From c143de603ffbbbd106d935dae35409da6584fce4 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 9 Dec 2005 19:03:07 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@959 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 15 ++++++++++++++- catalyst | 4 ++-- targets/embedded/embedded-chroot.sh | 4 +--- targets/grp/grp-chroot.sh | 5 +---- targets/livecd-stage1/livecd-stage1-chroot.sh | 3 +-- targets/netboot/netboot-chroot.sh | 3 +-- targets/netboot/netboot-combine.sh | 4 ++-- targets/stage1/stage1-chroot.sh | 4 +--- targets/stage3/stage3-chroot.sh | 3 +-- targets/stage4/stage4-chroot.sh | 1 - targets/support/chroot-functions.sh | 12 ------------ targets/support/kmerge.sh | 1 - targets/support/livecdfs-update.sh | 6 +++--- targets/support/unmerge.sh | 3 +-- 14 files changed, 28 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58d3cb29..3614a983 100644 --- 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 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 targets/support/livecdfs-update.sh: diff --git a/catalyst b/catalyst index 4205eedc..71e5e117 100755 --- 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 @@ -10,7 +10,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__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 429365a6..63429ed0 100755 --- 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 39e223b5..99f18c0a 100755 --- 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 fc00cd13..b668caba 100755 --- 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 6bc37740..7a888194 100755 --- 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 7d24bd29..a7b27543 100644 --- 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 4ce3a658..26e92507 100755 --- 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 a6828631..367236f4 100755 --- 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 5bd3848c..4e503627 100755 --- 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 a6931a57..b11f822b 100755 --- 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 13a9f9fe..48b5d7a0 100755 --- 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 badf2f21..aff6a525 100755 --- 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 ee4a4b9e..5dc4d5be 100644 --- 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}" -- 2.26.2