Repository navigation
Stage 04's, acceptance's, the installer's and the service-tree suite's comments are shorter, with their reasons kept - #260
Merged
Conversation
…s comments are shorter, with their reasons kept: cleanup-held's cut of 04-base-system.sh, acceptance.sh, kryptik-install.sh and tests/services.sh, redone on main by hand, comments only The last files of the redo, which #180 and #207 also touch. Every region near their changes is left as main has it, so both merge as they did (run-ovmf.sh, their one conflict with main, is not touched). Main's text stays where the cut drops a reason: why FORCE_UNSAFE_CONFIGURE is harmless, tree_digest's contract, meson never fetching unlocked sources, cmake's fallback, that a step's fingerprint is its function's text, the CET reruns, git's one trusted checkout, how A and B are chosen, the boot inputs refused, and the installer's header, first refusal, slot arithmetic shared with test-disk-size.sh and passphrase path. acceptance.sh's header is its --help and stays.
…nce where a part's "not run (--only ...)" comes from From a non-author read: crypt() is gone from glibc since 2.39, json-c is built with cmake and LVM2 needs libaio; those comments are why the rows exist.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
The last part of the cleanup-held redo, after #241-#259: the files #180 and #207 touch. Comments only, in
build/stages/04-base-system.sh,tools/acceptance.sh,tools/install/kryptik-install.shandtools/tests/services.sh.tools/image/run-ovmf.shis left out.#180 and #207. Both wait for v1.0.0. Every region next to their changes is left as main has it.
git merge-treeof this head with each of them gives the same single conflict as with main today, in run-ovmf.sh, which this PR does not touch, so both merge exactly as they did. One cut beside the PACKAGES row they add was reverted for that reason.How it was done. The same procedure as #242. Cleanup-held's change was merged onto main, only regions where every changed line is a comment were kept, and each cut was read by hand. Stripping comments from main's version and this one gives the same code in all four files, and
bash -n/sh -npass. Stage 04's steps fingerprint bydeclare -f, which drops comments, so nothing is rebuilt.Kept from main, because the cut drops a reason:
FORCE_UNSAFE_CONFIGURE=1is harmless (upstream's switch for that one check)tree_digest's contract (a renamed file counts, a directory stands for its files)--wrap-mode=nodownloadkeeping unlocked sources out--helpprintstools/image/test-disk-size.shKept from the cut: shorter comments on stage 04's package rows and helpers, acceptance's parts, merge, items, export and notes, the installer's device helpers, Kryptik-disk refusal and ISO offset, and three in the service-tree suite.
How the run proves it. CI's shell lint and fixture step cover these files. Nothing else changes.