diff options
| author |   Unit 193 <unit193@unit193.net> | 2022-11-22 04:41:38 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2022-11-22 04:41:38 -0500 |
| commit | 7963deabd324e1ed2da8856b17ad92111d1803ac (patch) | |
| tree | 21b66cad97d433268bb3cea36211444ce9b304b7 /genfstab.in | |
| parent | 22431138a68c90f6ff32d40380b049810a028a75 (diff) | |
| parent | ddb281387aa1c4981bb3059d5703ab17fd6ab191 (diff) | |
Update upstream source from tag 'upstream/28'
Update to upstream version '28'
with Debian dir a1ca264a7fcc6b8ebc3f8235ff982b33b69ca65a
Diffstat (limited to 'genfstab.in')
| -rw-r--r-- | genfstab.in | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/genfstab.in b/genfstab.in index 6a2ad10..df2b802 100644 --- a/genfstab.in +++ b/genfstab.in @@ -58,6 +58,14 @@ optstring_apply_quirks() { fi case $fstype in + btrfs) + # Having only one of subvol= and subvolid= is enough for mounting a btrfs subvolume + # And having subvolid= set prevents things like 'snapper rollback' to work, as it + # updates the subvolume in-place, leaving subvol= unchanged with a different subvolid. + if optstring_has_option "$varname" subvol; then + optstring_remove_option "$varname" subvolid + fi + ;; f2fs) # These are Kconfig options for f2fs. Kernels supporting the options will # only provide the negative versions of these (e.g. noacl), and vice versa @@ -166,6 +174,7 @@ findmnt -Recvruno SOURCE,TARGET,FSTYPE,OPTIONS,FSROOT "$root" | if [[ $fsroot != / && $fstype != btrfs ]]; then # it's a bind mount src=$(findmnt -funcevo TARGET "$src")$fsroot + src="/${src#$root/}" if [[ $src -ef $target ]]; then # hrmm, this is weird. we're probably looking at a file or directory # that was bound into a chroot from the host machine. Ignore it, |