diff --git a/bootstrap_sdk b/bootstrap_sdk index b6a0da1a79..aad43d9361 100755 --- a/bootstrap_sdk +++ b/bootstrap_sdk @@ -49,7 +49,7 @@ stage4/packages: coreos-devel/sdk-depends stage4/fsscript: ${BUILD_LIBRARY_DIR}/catalyst_default_stage4.sh stage4/root_overlay: ${TEMPDIR}/stage4_overlay stage4/empty: /etc/portage/repos.conf /root /usr/portage /var/cache/edb -stage4/rm: /etc/machine-id /etc/resolv.conf /etc/portage/make.conf +stage4/rm: /etc/machine-id /etc/resolv.conf EOF catalyst_stage_default } diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh index 914e8351f1..fac370d763 100755 --- a/sdk_lib/make_chroot.sh +++ b/sdk_lib/make_chroot.sh @@ -141,7 +141,7 @@ init_users () { init_setup () { info "Running init_setup()..." # clean up old catalyst configs to avoid error from env-update - # TODO(marineam): remove in a week or so + # TODO(marineam): remove repos.conf bit in a week or so rm -f "${FLAGS_chroot}/etc/portage/make.conf" \ "${FLAGS_chroot}/etc/portage/repos.conf/coreos.conf"