From 3f91bb819b545866f2dd2535828bd57fa114a669 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 28 Jan 2005 18:37:23 +0000 Subject: [PATCH] Added ability to pause indefinitely. This closes bug #79798. I've also added the gcond-2 killall back in, but now it is in the actual preclean script and is executed inside the chroot. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@530 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 13 ++++++++++++- targets/embedded/embedded-chroot.sh | 10 ++++++++-- targets/grp/grp-chroot.sh | 10 ++++++++-- targets/livecd-stage1/livecd-stage1-chroot.sh | 10 ++++++++-- .../livecd-stage1/livecd-stage1-preclean-chroot.sh | 4 +++- targets/livecd-stage1/livecd-stage1.sh | 9 ++++----- targets/netboot/netboot-packages.sh | 10 ++++++++-- targets/stage1/stage1-chroot.sh | 10 ++++++++-- targets/stage3/stage3-chroot.sh | 10 ++++++++-- targets/tinderbox/tinderbox-chroot.sh | 10 ++++++++-- 10 files changed, 75 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2135590d..052f5daf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.156 2005/01/26 22:11:31 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.157 2005/01/28 18:37:23 wolf31o2 Exp $ + + 28 Jan 2005; Chris Gianelloni + targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, + targets/livecd-stage1/livecd-stage1-chroot.sh, + targets/livecd-stage1/livecd-stage1-preclean-chroot.sh, + targets/livecd-stage1/livecd-stage1.sh, + targets/netboot/netboot-packages.sh, targets/stage1/stage1-chroot.sh, + targets/stage3/stage3-chroot.sh, targets/tinderbox/tinderbox-chroot.sh: + Added ability to pause indefinitely. This closes bug #79798. I've also added + the gcond-2 killall back in, but now it is in the actual preclean script and + is executed inside the chroot. 26 Jan 2005; Chris Gianelloni catalyst: Updated for 1.1.3 release. diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh index c26a2507..3e970fe9 100755 --- a/targets/embedded/embedded-chroot.sh +++ b/targets/embedded/embedded-chroot.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/embedded/embedded-chroot.sh,v 1.12 2005/01/13 22:57:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.13 2005/01/28 18:37:23 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -56,7 +56,13 @@ fi if [ "${clst_VERBOSE}" ] then ROOT=/tmp/mergeroot emerge ${clst_myemergeopts} -vp ${clst_embedded_packages} || exit 1 - sleep 15 + echo "Press any key within 15 seconds to pause the build..." + read -s -t 15 -n 1 + if [ $? -eq 0 ] + then + echo "Press any key to continue..." + read -s -n 1 + fi fi ROOT=/tmp/mergeroot emerge ${clst_myemergeopts} ${clst_embedded_packages} || exit 1 diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh index 10031551..4a79a078 100755 --- a/targets/grp/grp-chroot.sh +++ b/targets/grp/grp-chroot.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/grp/grp-chroot.sh,v 1.13 2005/01/26 21:59:40 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.14 2005/01/28 18:37:23 wolf31o2 Exp $ # check portage version in seed stage portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ @@ -55,7 +55,13 @@ then if [ -n "${clst_VERBOSE}" ] then emerge --usepkg --buildpkg --noreplace --newuse -vp ${clst_myemergeopts} ${clst_grp_packages} || exit 1 - sleep 15 + echo "Press any key within 15 seconds to pause the build..." + read -s -t 15 -n 1 + if [ $? -eq 0 ] + then + echo "Press any key to continue..." + read -s -n 1 + fi fi emerge --usepkg --buildpkg --noreplace --newuse ${clst_myemergeopts} ${clst_grp_packages} || exit 1 diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh index af82c7cc..7c770aca 100755 --- a/targets/livecd-stage1/livecd-stage1-chroot.sh +++ b/targets/livecd-stage1/livecd-stage1-chroot.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/livecd-stage1/livecd-stage1-chroot.sh,v 1.13 2005/01/26 21:59:40 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.14 2005/01/28 18:37:23 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -55,7 +55,13 @@ export USE_ORDER="env:pkg:conf:defaults" if [ "${clst_VERBOSE}" ] then emerge ${clst_emergeopts} -vp ${clst_packages} - sleep 15 + echo "Press any key within 15 seconds to pause the build..." + read -s -t 15 -n 1 + if [ $? -eq 0 ] + then + echo "Press any key to continue..." + read -s -n 1 + fi fi portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh index e5f61920..bbab3e64 100755 --- a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh +++ b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh @@ -1,7 +1,9 @@ #!/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/livecd-stage1/livecd-stage1-preclean-chroot.sh,v 1.4 2004/10/15 02:46:58 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh,v 1.5 2005/01/28 18:37:23 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile + +killall -9 gconfd-2 diff --git a/targets/livecd-stage1/livecd-stage1.sh b/targets/livecd-stage1/livecd-stage1.sh index 363e885a..1fda1177 100755 --- a/targets/livecd-stage1/livecd-stage1.sh +++ b/targets/livecd-stage1/livecd-stage1.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/livecd-stage1/Attic/livecd-stage1.sh,v 1.15 2005/01/11 14:10:19 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.16 2005/01/28 18:37:23 wolf31o2 Exp $ case $1 in enter) @@ -16,10 +16,9 @@ case $1 in ;; preclean) - #killall -9 gconfd-2 - #cp ${clst_sharedir}/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh ${clst_chroot_path}/tmp - #${clst_CHROOT} ${clst_chroot_path} /tmp/livecd-stage1-preclean-chroot.sh || exit 1 - #rm -f ${clst_chroot_path}/tmp/livecd-stage1-preclean-chroot.sh + cp ${clst_sharedir}/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh ${clst_chroot_path}/tmp + ${clst_CHROOT} ${clst_chroot_path} /tmp/livecd-stage1-preclean-chroot.sh || exit 1 + rm -f ${clst_chroot_path}/tmp/livecd-stage1-preclean-chroot.sh exit 0 ;; diff --git a/targets/netboot/netboot-packages.sh b/targets/netboot/netboot-packages.sh index 7abe23bc..ea321751 100644 --- a/targets/netboot/netboot-packages.sh +++ b/targets/netboot/netboot-packages.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/netboot/Attic/netboot-packages.sh,v 1.5 2005/01/26 21:59:40 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/Attic/netboot-packages.sh,v 1.6 2005/01/28 18:37:23 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -31,7 +31,13 @@ fi if [ "${clst_VERBOSE}" ] then emerge ${clst_myemergeopts} -vp ${clst_packages} - sleep 15 + echo "Press any key within 15 seconds to pause the build..." + read -s -t 15 -n 1 + if [ $? -eq 0 ] + then + echo "Press any key to continue..." + read -s -n 1 + fi fi emerge ${clst_myemergeopts} ${clst_packages} diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 0be0e35c..744510ff 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.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/stage1/stage1-chroot.sh,v 1.27 2005/01/13 22:57:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.28 2005/01/28 18:37:23 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -56,7 +56,13 @@ STAGE1_USE="$(portageq envvar STAGE1_USE)" if [ -n "${clst_VERBOSE}" ] then USE="-* build" emerge ${clst_myemergeopts} -vp --noreplace ${clst_buildpkgs} || exit 1 - sleep 15 + echo "Press any key within 15 seconds to pause the build..." + read -s -t 15 -n 1 + if [ $? -eq 0 ] + then + echo "Press any key to continue..." + read -s -n 1 + fi fi USE="-* build ${STAGE1_USE}" emerge ${clst_myemergeopts} --noreplace ${clst_buildpkgs} || exit 1 diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh index 7348e720..2d3eb3ee 100755 --- a/targets/stage3/stage3-chroot.sh +++ b/targets/stage3/stage3-chroot.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/stage3/stage3-chroot.sh,v 1.16 2005/01/13 22:57:25 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.17 2005/01/28 18:37:23 wolf31o2 Exp $ portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \ | cut -d/ -f2 | cut -d- -f2,3` @@ -56,7 +56,13 @@ USE="build" emerge portage if [ -n "${clst_VERBOSE}" ] then emerge -e ${clst_myemergeopts} -vp system || exit 1 - sleep 15 + echo "Press any key within 15 seconds to pause the build..." + read -s -t 15 -n 1 + if [ $? -eq 0 ] + then + echo "Press any key to continue..." + read -s -n 1 + fi fi emerge -e ${clst_myemergeopts} system || exit 1 diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh index 38627cff..3bbe96ab 100755 --- a/targets/tinderbox/tinderbox-chroot.sh +++ b/targets/tinderbox/tinderbox-chroot.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/tinderbox/tinderbox-chroot.sh,v 1.9 2005/01/26 21:59:40 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-chroot.sh,v 1.10 2005/01/28 18:37:23 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -38,7 +38,13 @@ do if [ -n "${clst_VERBOSE}" ] then emerge --usepkg --buildpkg -vp $x - sleep 5 + echo "Press any key within 15 seconds to pause the build..." + read -s -t 15 -n 1 + if [ $? -eq 0 ] + then + echo "Press any key to continue..." + read -s -n 1 + fi fi emerge --usepkg --buildpkg $x -- 2.26.2