snapcraft.yaml: Fix config installation #239
Merged
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #239 +/- ##
==========================================
+ Coverage 84.63% 94.12% +9.48%
==========================================
Files 18 18
Lines 3404 3404
==========================================
+ Hits 2881 3204 +323
+ Misses 443 127 -316
+ Partials 80 73 -7
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
|
Test looks good to me |
u-i expects mkfs configs in /etc/ubuntu-image/mkfs/$SERIES/mke2fs.conf, this makes sure they get installed to the correct directory
Make sure we detect any future error in the mkfs conf path we ship in the snap. Signed-off-by: Paul Mars <[email protected]>
Signed-off-by: Paul Mars <[email protected]>
Signed-off-by: Paul Mars <[email protected]>
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.
u-i expects mkfs configs in /etc/ubuntu-image/mkfs/$SERIES/mke2fs.conf, this makes sure they get installed to the correct directory
The lookup path is constructed in https://github.com/canonical/ubuntu-image/blob/main/internal/statemachine/helper.go#L296 as
strings.Join([]string{osGetenv("SNAP"), MKE2FS_BASE_PATH, series, MKE2FS_CONFIG_FILE}, "/")which expands to/etc/ubuntu-image/mkfs/$series/mke2fs.conf.Previously the configs were installed in
/etc/ubuntu-image/confs/$series/mke2fs.confinstead and consequently ignored.