Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

genfstab: fix duplicate subvol entries #4

Merged
merged 1 commit into from Mar 11, 2021
Merged

genfstab: fix duplicate subvol entries #4

merged 1 commit into from Mar 11, 2021

Conversation

takeshibaconsuzuki
Copy link
Contributor

Options parsed from findmnt may already have the subvol option, so we
check if "subvol=" is in $opt before appending onto it.

Fixes FS#65003

@falconindy
Copy link
Contributor

I'd be inclined to just drop the addition of the subvol param entirely.

@takeshibaconsuzuki
Copy link
Contributor Author

I've removed the if statement entirely. Could you take a look?

@falconindy
Copy link
Contributor

Well you can't remove the if statement entirely -- now you're treating btrfs subvolumes as bind mounts.

@takeshibaconsuzuki
Copy link
Contributor Author

Whoops, you're right. I've added a check to make sure fstype is not btrfs.

genfstab.in Outdated Show resolved Hide resolved
@falconindy
Copy link
Contributor

..and this should all be a single commit.

@takeshibaconsuzuki
Copy link
Contributor Author

Done.

Options parsed from findmnt may already have the subvol option, so
appending the subvol option is unnecessary.

Fixes FS#65003

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
@eli-schwartz
Copy link
Contributor

Apologies for letting this drop off the radar.

@eli-schwartz eli-schwartz merged commit ca8e8f6 into archlinux:master Mar 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants