macOS - '/System/Volumes/Data' DiskDevice path remapping #162
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
Fixes #158 On macOS APFS disk all users' data is mounted in '/System/Volumes/Data' but fused transparently using firmlinks and presented as part of the root filesystem. It requires remapping Data volume path for this DiskDevice to '/' in order for fclones correctly recognise device deduplicated files are on. Ref: https://www.swiftforensics.com/2019/10/macos-1015-volumes-firmlink-magic.html https://eclecticlight.co/2020/01/23/catalina-boot-volumes/
|
Not sure what is wrong with my format.... |
|
Formatting fixed. |
pkolaczk
reviewed
Sep 9, 2022
src/device.rs
Outdated
Comment on lines
257
to
259
| if cfg!(target_os = "macos") { | ||
| if String::from_utf8_lossy(d.file_system()) == "apfs" | ||
| && d.mount_point().to_string_lossy() == "/System/Volumes/Data" |
There was a problem hiding this comment.
This condition can be flattened and slightly simplified:
if cfg!(target_os = "macos")
&& d.file_system() == b"apfs"
&& d.mount_point().to_str() == Some("/System/Volumes/Data") {
result.mount_points.push((Path::from("/"), index));
} else {
result
.mount_points
.push((Path::from(d.mount_point()), index));
}and remove the repetition of the else clause.
There was a problem hiding this comment.
you are right. I have not written any code for long... and also not used github as you can see by small mess I created. But things are coming back quickly.
Doing it now.
pkolaczk
approved these changes
Sep 9, 2022
|
Done and all grenn |
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.
Fixes #158
On macOS APFS disk all users' data is mounted in '/System/Volumes/Data' but fused transparently using firmlinks and presented as part of the root filesystem. It requires remapping Data volume path for this DiskDevice to '/' in order for fclones correctly recognise device deduplicated files are on.
Ref:
https://www.swiftforensics.com/2019/10/macos-1015-volumes-firmlink-magic.html
https://eclecticlight.co/2020/01/23/catalina-boot-volumes/