diff options
| author | librewish | 2021-09-15 20:42:07 +0530 |
|---|---|---|
| committer | librewish | 2021-09-15 20:42:07 +0530 |
| commit | 69cab91b343aef6d0c887aeae6cbc0ddbdcbccc0 (patch) | |
| tree | de271501214faa303bf11b33099534696c1852a9 /os-prober-make-btrfsprogs-optional.patch | |
| parent | 66857a13aebc4ff4da0f06b027231b18cdefc314 (diff) | |
| download | aur-69cab91b343aef6d0c887aeae6cbc0ddbdcbccc0.tar.gz | |
revert all patches
Diffstat (limited to 'os-prober-make-btrfsprogs-optional.patch')
| -rw-r--r-- | os-prober-make-btrfsprogs-optional.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/os-prober-make-btrfsprogs-optional.patch b/os-prober-make-btrfsprogs-optional.patch deleted file mode 100644 index 057edc29e780..000000000000 --- a/os-prober-make-btrfsprogs-optional.patch +++ /dev/null @@ -1,31 +0,0 @@ -ndex: os-prober-1.76/os-probes/common/50mounted-tests -=================================================================== ---- os-prober-1.76.orig/os-probes/common/50mounted-tests -+++ os-prober-1.76/os-probes/common/50mounted-tests -@@ -151,11 +151,20 @@ if [ "$types" = btrfs ]; then - rmdir "$tmpmnt" || true - exit 1 - fi -- # besides regular subvols, get ro and snapshot so thet can be excluded -- 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 type btrfs >/dev/null 2>&1; then -+ # besides regular subvols, get ro and snapshot so thet can be excluded -+ 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) -+ else -+ subvols="" -+ rosubvols="" -+ sssubvols="" -+ defaultvol="" -+ fi -+ - if ! umount "$tmpmnt"; then - warn "failed to umount btrfs volume on $tmpmnt" - rmdir "$tmpmnt" || true - |