Fix logic around grml_sources handling no longer being bind-mounted #229
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In commit 87524f9 we adjusted the grml_sources handling, as bind mounts are not allowed in (unprivileged) docker. Now when running grml-live with SOURCES class enabled multiple times in a row (e.g. via grml-live's `-b` or `-u` options), one ends up with the $OUTPUT/grml_sources *and* $OUTPUT/grml_chroot/grml-live/grml_sources directories. grml-live then complains: mv: cannot overwrite '$OUTPUT/grml_sources': Directory not empty rmdir: failed to remove '$OUTPUT/grml_chroot/grml-live': Directory not empty As of commit 8b0a6fa we generate a source package tarball when using the SOURCES class, so one might want to remove the "${OUTPUT}/grml_sources" directory anyway (similar to what we're doing in commit 6486c84 in our CI runs). But let's also fix the underlying logic and move grml_sources around as expected.
zeha
approved these changes
Dec 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In commit 87524f9 we adjusted the grml_sources handling, as bind mounts are not allowed in (unprivileged) docker.
Now when running grml-live with SOURCES class enabled multiple times in a row (e.g. via grml-live's
-bor-uoptions), one ends up with the $OUTPUT/grml_sources and $OUTPUT/grml_chroot/grml-live/grml_sources directories. grml-live then complains:As of commit 8b0a6fa we generate a source package tarball when using the SOURCES class, so one might want to remove the "${OUTPUT}/grml_sources" directory anyway (similar to what we're doing in commit 6486c84 in our CI runs). But let's also fix the underlying logic and move grml_sources around as expected.