Get partition type for unmounted partitions #305
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
|
will rebase if #304 gets in :) |
|
rebased! |
|
@fromanirh any updates on this? thanks! |
jaypipes
requested changes
Mar 24, 2022
pkg/block/block_linux_test.go
Outdated
| // Check empty fs if not found | ||
| fs = diskPartTypeUdev(paths, "sda", "sda2") | ||
| if fs != util.UNKNOWN { | ||
| t.Fatalf("Got label %s, but expected %s label", fs, util.UNKNOWN) |
| @@ -237,6 +240,18 @@ func diskPartLabel(paths *linuxpath.Paths, disk string, partition string) string | |||
| return util.UNKNOWN | |||
| } | |||
|
|
|||
| func diskPartTypeUdev(paths *linuxpath.Paths, disk string, partition string) string { | |||
There was a problem hiding this comment.
Please add a quick docstring indicating this function is used as a fallback when partitionInfo() fails to determine a partition type, which happens when the partition is not mounted.
pkg/block/block_linux_test.go
Outdated
| _ = os.Mkdir(filepath.Join(paths.SysBlock, "sda", "sda1"), 0755) | ||
| _ = ioutil.WriteFile(filepath.Join(paths.SysBlock, "sda", "sda1", "dev"), []byte("259:0\n"), 0644) | ||
| _ = ioutil.WriteFile(filepath.Join(paths.RunUdevData, "b259:0"), []byte(fmt.Sprintf("E:ID_FS_TYPE=%s\n", fsType)), 0644) | ||
| fs := diskPartTypeUdev(paths, "sda", "sda1") |
There was a problem hiding this comment.
consider renaming fsType to expectedPartType and fs variables to pt to align with the "partition type" terminology (and yes, I realize udev uses "FS_TYPE" term :) )
|
I see @jaypipes is already on it; I will have a look myself today/tomorrow as well |
jaypipes
approved these changes
Mar 24, 2022
added 2 commits
March 24, 2022 14:58
If a partition is unmounted our current way of getting the partition type wont work, as it only checks for mounted partitions. This patch makes it check in udev if the partition type is empty Signed-off-by: Itxaka <igarcia@suse.com>
Signed-off-by: Itxaka <igarcia@suse.com>
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.
If a partition is unmounted our current way of getting the partition
type wont work, as it only checks for mounted partitions.
This patch makes it check in udev if the partition type is empty
This requires #304 as that brings the udevInfoPartition
Signed-off-by: Itxaka igarcia@suse.com