summarylogtreecommitdiffstats
path: root/os-prober-btrfs-snapshot-detection.patch
diff options
context:
space:
mode:
Diffstat (limited to 'os-prober-btrfs-snapshot-detection.patch')
-rw-r--r--os-prober-btrfs-snapshot-detection.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/os-prober-btrfs-snapshot-detection.patch b/os-prober-btrfs-snapshot-detection.patch
deleted file mode 100644
index e68637e3525..00000000000
--- a/os-prober-btrfs-snapshot-detection.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: os-prober/os-probes/common/50mounted-tests
-===================================================================
---- os-prober.orig/os-probes/common/50mounted-tests
-+++ os-prober/os-probes/common/50mounted-tests
-@@ -115,6 +115,7 @@ if [ "$types" = btrfs ]; then
- subvols=$(btrfs subvolume list -a "$tmpmnt" | cut -d ' ' -f 9 | sed -e s!^\<FS_TREE\>/!!)
- rosubvols=$(btrfs subvolume list -r -a "$tmpmnt" | cut -d ' ' -f 9 | sed -e s!^\<FS_TREE\>/!!)
- sssubvols=$(btrfs subvolume list -s -a "$tmpmnt" | cut -d ' ' -f 14 | sed -e s!^\<FS_TREE\>/!!)
-+ defaultvol=$(btrfs subvolume get-default "$tmpmnt" | cut -d ' ' -f 9)
- if ! umount "$tmpmnt"; then
- warn "failed to umount btrfs volume on $tmpmnt"
- rmdir "$tmpmnt" || true
-@@ -127,11 +128,13 @@ if [ "$types" = btrfs ]; then
- found=
- for subvol in $subvols; do
- debug "begin btrfs processing for $UUID subvol=$subvol"
-- if echo "$rosubvols" | grep -q -x "$subvol"; then
-- continue
-- fi
-- if echo "$sssubvols" | grep -q -x "$subvol"; then
-- continue
-+ if [ "$subvol" != "$defaultvol" ]; then
-+ if echo "$rosubvols" | grep -q -x "$subvol"; then
-+ continue
-+ fi
-+ if echo "$sssubvols" | grep -q -x "$subvol"; then
-+ continue
-+ fi
- fi
- mounted=
- mpoint="$(grep btrfs /proc/self/mountinfo | grep "$partition " | grep "/$subvol " | cut -d ' ' -f 5)"
-