Added ability to pause indefinitely. This closes bug #79798. I've also added the...

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

diff --git a/ChangeLog b/ChangeLog
index 2135590deb412059bd362a938ea2f7e73b26c2b2..052f5daf207c738a242118f3414a85f6b909f38a 100644 (file)
--- 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 <wolf31o2@gentoo.org>
+  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 <wolf31o2@gentoo.org> catalyst:
   Updated for 1.1.3 release.

diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
index c26a25076c232c561e3b1143ad0a33c25e9ff46d..3e970fe984b1e49c92f4921e80e66586aa9c1804 100755 (executable)
--- 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 1003155185eb92bcf2fc7ecb95e98fc23358b3ff..4a79a0781adcfd115fe609e01f3a76fac1bac1a9 100755 (executable)
--- 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 af82c7cc4eefb854aa44f445d11df4bdc2874494..7c770aca3acee73ca99bd29aa616062d80b9fd7e 100755 (executable)
--- 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 e5f6192087522fb003a04cdc0d9281a66764d7f6..bbab3e6439683d21baad97b40865283a3dab1fd8 100755 (executable)
--- 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 363e885abce7efcb3a0b4fe3102bd10c124551a7..1fda1177fa57bef8a5423d0081e6a9cde12ed608 100755 (executable)
--- 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 7abe23bcb36fd0f6e6bd4d88192e6603cbf3286d..ea32175122ce4e4b59299843e16fa5f8077277f4 100644 (file)
--- 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 0be0e35cbaed28eeb1f1e8da5c9039fb9e812028..744510ff4da1f49cfefe3a9bcca65365a787c396 100755 (executable)
--- 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 7348e72013be8ee39347eafe4b89eb9f3574dcea..2d3eb3eedf8b8a5cafc403f9b38883669899e205 100755 (executable)
--- 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 38627cff33344ac07e96c3e0c2d3631cd9435164..3bbe96abb4e8e59207b23af27b8945f839235a33 100755 (executable)
--- 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