rm: Implement --one-file-system and --preserve-root=all #7569
Conversation
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
sylvestre
reviewed
Mar 25, 2025
src/uu/rm/src/rm.rs
Outdated
Comment on lines
565
to
580
| match validate_single_filesystem(path) { | ||
| Ok(()) => true, | ||
| Err(additional_reason) => { | ||
| if !additional_reason.is_empty() { | ||
| show_error!("{}", additional_reason); | ||
| } | ||
| show_error!( | ||
| "skipping {}, since it's on a different device", | ||
| path.quote() | ||
| ); | ||
| if options.preserve_root == PreserveRoot::YesAll { | ||
| show_error!("and --preserve-root=all is in effect"); | ||
| } | ||
| false | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
can probably be simplified with something like:
Suggested change
| match validate_single_filesystem(path) { | |
| Ok(()) => true, | |
| Err(additional_reason) => { | |
| if !additional_reason.is_empty() { | |
| show_error!("{}", additional_reason); | |
| } | |
| show_error!( | |
| "skipping {}, since it's on a different device", | |
| path.quote() | |
| ); | |
| if options.preserve_root == PreserveRoot::YesAll { | |
| show_error!("and --preserve-root=all is in effect"); | |
| } | |
| false | |
| } | |
| } | |
| let result = validate_single_filesystem(path); | |
| if result.is_ok() { | |
| return true; | |
| } | |
| if let Err(additional_reason) = result { | |
| if !additional_reason.is_empty() { | |
| show_error!("{}", additional_reason); | |
| } | |
| } | |
| show_error!( | |
| "skipping {}, since it's on a different device", | |
| path.quote() | |
| ); | |
| if options.preserve_root == PreserveRoot::YesAll { | |
| show_error!("and --preserve-root=all is in effect"); | |
| } | |
| false |
Contributor
Author
There was a problem hiding this comment.
Thank you for pointing that out! I've implemented the suggested simplification.
|
GNU testsuite comparison: |
Contributor
|
some jobs are failing :) |
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
Contributor
|
does |
|
GNU testsuite comparison: |
Contributor
Author
|
The following is the test result. It has passed. |
Contributor
Author
|
I tried again and it failed, so I will fix it. |
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
sylvestre
force-pushed
the
rm-one-file-system
branch
from
2b9e697 to
3882f38
Compare
|
GNU testsuite comparison: |
Contributor
|
Sorry, i think i made a mistake with the conflict resolution :( could you please fix it? thanks |
Contributor
Author
|
No warries, I'll fix it. |
shskwmt
force-pushed
the
rm-one-file-system
branch
from
5e09b83 to
42a24fb
Compare
|
GNU testsuite comparison: |
Contributor
|
sorry, i missed it :( |
shskwmt
force-pushed
the
rm-one-file-system
branch
from
42a24fb to
f4adf86
Compare
|
GNU testsuite comparison: |
shskwmt
force-pushed
the
rm-one-file-system
branch
from
f4adf86 to
5dd9c19
Compare
This comment enhances the safety of recursive deletion in `rm` by introducing two key features to prevent accidental data loss. `--one-file-system`: When specified, `rm` will not traverse into directories that are on a different file system from the one on which the traversal began, this prevents `rm -r` from accidentally deleting data on mounted volumes. `--preserve-root=all`: The `--preserve-root` option is enhanced to accept an optional argument, `all`. When set to `all`, `rm` will refuse to remove any directory that is a mount point. The default behavior (`--preserve-root` without an argument) remains, protecting only the root directory (`/`).
shskwmt
force-pushed
the
rm-one-file-system
branch
from
5dd9c19 to
8d0a839
Compare
|
GNU testsuite comparison: |
Contributor
Author
|
I've finished rebasing the branch. |
sylvestre
reviewed
Dec 26, 2025
src/uu/rm/src/rm.rs
Outdated
| } else { | ||
| match matches | ||
| .get_one::<String>(OPT_PRESERVE_ROOT) | ||
| .unwrap() |
Contributor
There was a problem hiding this comment.
please remove the unwrap()
sylvestre
reviewed
Dec 26, 2025
src/uu/rm/src/rm.rs
Outdated
| .map_err(|err| format!("cannot canonicalize {}: {err}", path.quote()))?; | ||
|
|
||
| // Get parent path, handling root case | ||
| let parent_canon = child_canon.parent().ok_or("")?.to_path_buf(); |
Contributor
There was a problem hiding this comment.
can we avoid the empty strings in ok_or(") ?
sylvestre
reviewed
Dec 26, 2025
src/uu/rm/src/rm.rs
Outdated
| fn handle_dir(path: &Path, options: &Options, progress_bar: Option<&ProgressBar>) -> bool { | ||
| let mut had_err = false; | ||
|
|
||
| if let Err(additional_reason) = check_one_fs(path, options) { |
Contributor
There was a problem hiding this comment.
same code as in line 621, please dedup
Collaborator
|
I see the Smack tests are failing in the CI here and it appears that its due to no space left on device. I'm guessing its caused when downloading the arch linux img |
Merging this PR will not alter performance
Comparing 
Footnotes
|
- Replace `.unwrap()` with `.map()` to handle options safely without risking panics. - Update the abbreviation check to compare against the `PreserveRoot` enum directly.
|
GNU testsuite comparison: |
Replace empty error strings with descriptive messages when path parent or mount point resolution fails. This aids in debugging by identifying specifically which path caused the resolution failure during the one-file-system check.
|
GNU testsuite comparison: |
Introduce `check_and_report_one_fs` to encapsulate the logic for verifying filesystem boundaries (`-x`) and root preservation. This removes code duplication between `remove_dir_recursive` and `handle_dir`, ensuring consistent error reporting for "different device" skips and `--preserve-root=all` violations.
|
GNU testsuite comparison: |
Split the initialization of `stat_path` in `Filesystem::new` into distinct `#[cfg(unix)]` and `#[cfg(windows)]` blocks. This improves readability and ensures that Windows builds consistently use the volume ID (`dev_id`).
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
Contributor
|
any idea why we don't get "Congrats! The gnu test tests/rm/one-file-system is no longer failing!" anymore? thanks |
Collaborator
|
It appears that one of the error messages is returning differently in the test: |
Collaborator
|
I'm taking a deeper look into the implementation and I'm curious about the decision to use the mount tables. The when using stat on the files you are able to get the device id from the st_dev value. When reading from the mount tables it brings in the potential for a race condition and that appears to be whats causing the GNU tests to fail. |
Collaborator
|
Would you be interested if I cherry-pick your PR and just modify the mount part to swap with the stat? Sorry that the feedback is getting there so much later than when you made the PR, but was wondering if this was something you were still interested in following up on? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Fixes #7011
Implement
--one-file-systemand--preserve-root=alloptions for thermcommand.