Signed-off-by: Andrew Page <admwiggin@gmail.com>
| ... | ... |
@@ -50,9 +50,10 @@ for mount in $(awk '{ print $5 }' /proc/self/mountinfo); do
|
| 50 | 50 |
done |
| 51 | 51 |
|
| 52 | 52 |
# now, let's go destroy individual btrfs subvolumes, if any exist |
| 53 |
-if command -v btrfs &> /dev/null; then |
|
| 53 |
+if command -v btrfs > /dev/null 2>&1; then |
|
| 54 | 54 |
root="$(df "$dir" | awk 'NR>1 { print $NF }')"
|
| 55 |
- for subvol in $(btrfs subvolume list -o "$root" 2>/dev/null | awk -F' path ' '{ print $2 }'); do
|
|
| 55 |
+ root="${root#/}" # if root is "/", we want it to become ""
|
|
| 56 |
+ for subvol in $(btrfs subvolume list -o "$root/" 2>/dev/null | awk -F' path ' '{ print $2 }' | sort -r); do
|
|
| 56 | 57 |
subvolDir="$root/$subvol" |
| 57 | 58 |
if dir_in_dir "$subvolDir" "$dir"; then |
| 58 | 59 |
( set -x; btrfs subvolume delete "$subvolDir" ) |