mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-25 15:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

bootstrap_sdk: do not leak catalyst config into sdk tarballs

Browse Source 
The version of repos.conf/coreos.conf that catalyst needs isn't valid
for normal SDK chroots and causes env-update to spew errors when it is
run prior to update_chroot which configures portage properly.
This commit is contained in:
Michael Marineau 2015-07-05 15:59:13 -07:00
parent 174a847e36
commit db734ea417
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap_sdk
View File

@ -48,8 +48,8 @@ pkgcache_path: $BINPKGS
stage4/packages: coreos-devel/sdk-depends 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: /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 stage4/rm: /etc/machine-id /etc/resolv.conf /etc/portage/make.conf
EOF EOF
catalyst_stage_default catalyst_stage_default
} }

5
sdk_lib/make_chroot.sh
View File

@ -146,6 +146,11 @@ 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
# TODO(marineam): remove in a week or so
rm -f "${FLAGS_chroot}/etc/portage/make.conf" \
"${FLAGS_chroot}/etc/portage/repos.conf/coreos.conf"
# Set up sudoers. Inside the chroot, the user can sudo without a password. # Set up sudoers. Inside the chroot, the user can sudo without a password.
# (Safe enough, since the only way into the chroot is to 'sudo chroot', so # (Safe enough, since the only way into the chroot is to 'sudo chroot', so
# the user's already typed in one sudo password...) # the user's already typed in one sudo password...)