Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bootstrap/node-image-pull.sh: handle "separate stateroot" flow better #9570

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −0
Draft

bootstrap/node-image-pull.sh: handle "separate stateroot" flow better #9570

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions data/data/bootstrap/files/usr/local/bin/node-image-pull.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,14 @@ etc_keep=$(ostree admin config-diff | cut -f5 -d' ' | sed -e 's,^,/usr/etc/,')
echo "Checking out node image content"
ostree checkout --repo "${ostree_repo}" ${hardlink} coreos/node-image "${ostree_checkout}" --skip-list=<(cat <<< "$etc_keep")

# In some flows, we currently keep using the same bootstrap state and just
# deploy in a separate stateroot instead of doing something closer to a
# reinstall. Let's nuke the ref so it eventually gets GC'ed, and also bump the
# mtime on the tmp dir so OSTree doesn't try to delete it when rebasing (because
# it won't be able to in this boot).
ostree refs --repo "${ostree_repo}" --delete coreos/node-image
touch "${ostree_checkout}"

# in the assisted-installer case, nuke the temporary repo to save RAM
if grep -q coreos.liveiso= /proc/cmdline; then
echo "Deleting temporary repo"
Expand Down