| 1 |
commit: f3c51fb01b54321c026cfb2857ba3ee65cecaf98 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 4 07:25:15 2016 +0000 |
| 4 |
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 7 02:40:57 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f3c51fb0 |
| 7 |
|
| 8 |
s/bootstrap-prefix.sh: remove EPREFIX/tmp after "emerge -e system". |
| 9 |
|
| 10 |
partially reverts 3a945696443b. |
| 11 |
|
| 12 |
A rerun of bootstrap script after "emerge -e system" failure |
| 13 |
should not go through stage1 again. |
| 14 |
|
| 15 |
scripts/bootstrap-prefix.sh | 14 +++++++------- |
| 16 |
1 file changed, 7 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 19 |
index a46ccdf..e05c81a 100755 |
| 20 |
--- a/scripts/bootstrap-prefix.sh |
| 21 |
+++ b/scripts/bootstrap-prefix.sh |
| 22 |
@@ -1520,12 +1520,6 @@ bootstrap_stage3() { |
| 23 |
# Switch to the proper portage. |
| 24 |
hash -r |
| 25 |
|
| 26 |
- # Get rid of the temporary tools. |
| 27 |
- if [[ -d ${ROOT}/tmp/var/tmp ]] ; then |
| 28 |
- rm -rf "${ROOT}"/tmp |
| 29 |
- mkdir "${ROOT}"/tmp |
| 30 |
- fi |
| 31 |
- |
| 32 |
# Update the portage tree. |
| 33 |
treedate=$(date -f "${ROOT}"/usr/portage/metadata/timestamp +%s) |
| 34 |
nowdate=$(date +%s) |
| 35 |
@@ -2173,7 +2167,13 @@ EOF |
| 36 |
|
| 37 |
hash -r # tmp/* stuff is removed in stage3 |
| 38 |
|
| 39 |
- if ! emerge -e system ; then |
| 40 |
+ if emerge -e system ; then |
| 41 |
+ # Now, after 'emerge -e system', we can get rid of the temporary tools. |
| 42 |
+ if [[ -d ${EPREFIX}/tmp/var/tmp ]] ; then |
| 43 |
+ rm -Rf "${EPREFIX}"/tmp || return 1 |
| 44 |
+ mkdir -p "${EPREFIX}"/tmp || return 1 |
| 45 |
+ fi |
| 46 |
+ else |
| 47 |
# emerge -e system fail |
| 48 |
cat << EOF |
Archives