diff options
| author |   Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2016-09-14 18:11:47 -0400 |
|---|---|---|
| committer | Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2016-09-14 18:11:47 -0400 |
| commit | 36f490a4476148f800fb7c16a6b45d46cc6ee4f7 (patch) | |
| tree | 07fa4ab08e9647887eefb2dcd6ceaa2be7d13354 | |
| parent | if CHOST is being reset that should have already been handled in make.conf so... (diff) | |
| download | catalyst-36f490a4476148f800fb7c16a6b45d46cc6ee4f7.tar.gz catalyst-36f490a4476148f800fb7c16a6b45d46cc6ee4f7.tar.bz2 catalyst-36f490a4476148f800fb7c16a6b45d46cc6ee4f7.zip | |
stage1-controller.sh was *not running in chroot*, move it's functions into the pre-clean which does safely run in chroot
| -rwxr-xr-x | targets/stage1/stage1-controller.sh | 5 | ||||
| -rwxr-xr-x | targets/stage1/stage1-preclean-chroot.sh | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh index 6af13850..ac813de0 100755 --- a/targets/stage1/stage1-controller.sh +++ b/targets/stage1/stage1-controller.sh @@ -27,10 +27,7 @@ case "$1" in ;; clean) - # Clean out man, info and doc files - rm -rf /tmp/stage1root/usr/share/{man,doc,info}/* - # Zap all .pyc and .pyo files - find /tmp/stage1root/ -iname "*.py[co]" -exec rm -f {} \; + exit 0 ;; *) diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh index 0ba4c00d..1b623f18 100755 --- a/targets/stage1/stage1-preclean-chroot.sh +++ b/targets/stage1/stage1-preclean-chroot.sh @@ -22,6 +22,11 @@ else echo UTC > "${ROOT}/etc/TZ" fi +# Clean out man, info and doc files +rm -rf "${ROOT}"/usr/share/{man,doc,info}/* +# Zap all .pyc and .pyo files +find "${ROOT}"/ -iname "*.py[co]" -exec rm -f {} \; + # unset ROOT for safety (even though cleanup_stages doesn't use it) unset ROOT cleanup_stages |