1 |
Catalyst shouldn't delay & read from stdin and prompt the user. |
2 |
Currently, using verbose mode will trigger that behavior. |
3 |
--- |
4 |
targets/stage2/stage2-chroot.sh | 7 ------- |
5 |
targets/support/chroot-functions.sh | 7 ------- |
6 |
targets/tinderbox/tinderbox-chroot.sh | 7 ------- |
7 |
3 files changed, 21 deletions(-) |
8 |
|
9 |
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh |
10 |
index 0e21ea6..b426dab 100755 |
11 |
--- a/targets/stage2/stage2-chroot.sh |
12 |
+++ b/targets/stage2/stage2-chroot.sh |
13 |
@@ -8,13 +8,6 @@ export FEATURES="${clst_myfeatures} nodoc noman noinfo -news" |
14 |
if [ "${clst_VERBOSE}" ] |
15 |
then |
16 |
/usr/portage/scripts/bootstrap.sh -p ${bootstrap_opts} |
17 |
- echo "Press any key within 15 seconds to pause the build..." |
18 |
- read -s -t 15 -n 1 |
19 |
- if [ $? -eq 0 ] |
20 |
- then |
21 |
- echo "Press any key to continue..." |
22 |
- read -s -n 1 |
23 |
- fi |
24 |
fi |
25 |
|
26 |
# Set bindist USE flag if clst_BINDIST is set |
27 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
28 |
index 2482651..fe40157 100755 |
29 |
--- a/targets/support/chroot-functions.sh |
30 |
+++ b/targets/support/chroot-functions.sh |
31 |
@@ -288,13 +288,6 @@ run_merge() { |
32 |
then |
33 |
echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1 |
34 |
emerge ${clst_myemergeopts} -pt $@ || exit 3 |
35 |
- echo "Press any key within 15 seconds to pause the build..." |
36 |
- read -s -t 15 -n 1 |
37 |
- if [ $? -eq 0 ] |
38 |
- then |
39 |
- echo "Press any key to continue..." |
40 |
- read -s -n 1 |
41 |
- fi |
42 |
fi |
43 |
|
44 |
echo "emerge ${clst_myemergeopts} $@" || exit 1 |
45 |
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh |
46 |
index 4ebc2cc..74e46d6 100755 |
47 |
--- a/targets/tinderbox/tinderbox-chroot.sh |
48 |
+++ b/targets/tinderbox/tinderbox-chroot.sh |
49 |
@@ -15,13 +15,6 @@ do |
50 |
if [ -n "${clst_VERBOSE}" ] |
51 |
then |
52 |
run_merge --usepkg --buildpkg --newuse -vp $x |
53 |
- echo "Press any key within 15 seconds to pause the build..." |
54 |
- read -s -t 15 -n 1 |
55 |
- if [ $? -eq 0 ] |
56 |
- then |
57 |
- echo "Press any key to continue..." |
58 |
- read -s -n 1 |
59 |
- fi |
60 |
fi |
61 |
|
62 |
mkdir -p /tmp/packages/$x |
63 |
-- |
64 |
2.5.2 |