mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-07 04:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

bootstrap_sdk: do not remove make.conf, turns out catalyst runs sed over it

Browse Source
This commit is contained in:
Michael Marineau 2015-07-06 13:13:45 -07:00
parent 2eec99130b
commit aa4ba8b2bb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap_sdk
View File

@ -49,7 +49,7 @@ stage4/packages: coreos-devel/sdk-depends
stage4/fsscript: ${BUILD_LIBRARY_DIR}/catalyst_default_stage4.sh stage4/fsscript: ${BUILD_LIBRARY_DIR}/catalyst_default_stage4.sh
stage4/root_overlay: ${TEMPDIR}/stage4_overlay stage4/root_overlay: ${TEMPDIR}/stage4_overlay
stage4/empty: /etc/portage/repos.conf /root /usr/portage /var/cache/edb 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 EOF
catalyst_stage_default catalyst_stage_default
} }

2
sdk_lib/make_chroot.sh
View File

@ -141,7 +141,7 @@ init_users () {
init_setup () { init_setup () {
info "Running init_setup()..." info "Running init_setup()..."
# clean up old catalyst configs to avoid error from env-update # 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" \ rm -f "${FLAGS_chroot}/etc/portage/make.conf" \
"${FLAGS_chroot}/etc/portage/repos.conf/coreos.conf" "${FLAGS_chroot}/etc/portage/repos.conf/coreos.conf"