Add support for multiple snapper configs#2
Open
SludgeGirl wants to merge 1 commit into
Open
Conversation
aplanas
reviewed
Apr 20, 2026
| verbose: bool, | ||
| ) -> Result<Vec<FileInfo>, std::io::Error> { | ||
| let snapshot_path = format!("/.snapshots/{snapshot}/snapshot"); | ||
| let snapshot_path = format!("{}/.snapshots/{snapshot}/snapshot", config.subvolume); |
Owner
There was a problem hiding this comment.
Is this the snapshot prefix? If is SUBVOLUME I have SUBVOLUME="/" in my root config file, so the interpolation would be //.snapshots/...
Also maybe {config.subvolume}?
| .unwrap_or_default(); | ||
| changes.modified.push(FileChange { | ||
| path: (*name).to_string(), | ||
| path: format!("{}{}", old_file.snapshot_subvolume, old_file.path), |
Owner
There was a problem hiding this comment.
Would not old_file contain the subvolume already in the path?
|
|
||
| let snapshots: Snapshots = serde_json::from_str(stdout).expect("Failed to parse JSON"); | ||
| Ok(snapshots) | ||
| let snapshots: HashMap<String, Vec<Snapshot>> = |
Owner
There was a problem hiding this comment.
Not sure that I understand this change. You should have stdout already, why to change the way of snapshots construction?
| .find(|s| s.active) | ||
| .map(|s| s.number) | ||
| .expect("No active snapshot found"); | ||
| let default = snapshots.root.iter().find(|s| s.default).map(|s| s.number); |
| let (old_snapshot, new_snapshot) = get_old_new_snapshots(cli, &config)?; | ||
|
|
||
| check_directory_exists_and_readable("/.snapshots")?; | ||
| check_directory_exists_and_readable(&format!("{}/.snapshots", config.subvolume))?; |
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
2 participants
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.
This aims to add support for multiple snapper configs. In some cases a user might have snapshots for root, but also for /var/logs, /home, etc