diff options
| author |   Unit 193 <unit193@unit193.net> | 2021-08-11 18:42:37 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2021-08-11 18:42:37 -0400 |
| commit | f922fa446f9893e571bf038c5e2d2520837c9814 (patch) | |
| tree | 508afe02ab343df45f95832388336d0aad5e5030 /genfstab.in | |
| parent | e1f5028f2c3adc68d125ddcdb290a34b03bc6809 (diff) | |
New upstream version 24.upstream/24
Diffstat (limited to 'genfstab.in')
| -rw-r--r-- | genfstab.in | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/genfstab.in b/genfstab.in index c626290..6a2ad10 100644 --- a/genfstab.in +++ b/genfstab.in @@ -163,23 +163,19 @@ findmnt -Recvruno SOURCE,TARGET,FSTYPE,OPTIONS,FSROOT "$root" | pass=0 fi - if [[ $fsroot != / ]]; then - if [[ $fstype = btrfs ]]; then - opts+=,subvol=${fsroot#/} - else - # it's a bind mount - src=$(findmnt -funcevo TARGET "$src")$fsroot - 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, - # because this won't actually be a valid mount. Worst case, the user - # just re-adds it. - continue - fi - fstype=none - opts+=,bind - pass=0 + if [[ $fsroot != / && $fstype != btrfs ]]; then + # it's a bind mount + src=$(findmnt -funcevo TARGET "$src")$fsroot + 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, + # because this won't actually be a valid mount. Worst case, the user + # just re-adds it. + continue fi + fstype=none + opts+=,bind + pass=0 fi # filesystem quirks |