lxc-destroy: Fix regular expression for getting rootfs

The `lxc-destroy` script was using a simple `grep` for extracting `lxc.rootfs` from the lxc config. This regex also matches commented lines and breaks at least removing btrfs subvolumes if the string `lxc.rootfs` is mentioned in a comment. Furthermore, due to the unescaped dot in the regex it would also match other wrong strings like `lxc rootfs`. This patch modifies the regular expression to correctly match the beginning of the line plus potential whitespace characters and the string `lxc.rootfs`. Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

lxc-destroy: Fix regular expression for getting rootfs
034a0159 · Franz Pletz · Serge Hallyn · 54e339f9 · 034a0159
Commit 034a0159 authored Aug 12, 2013 by Franz Pletz Committed by Serge Hallyn Aug 12, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

lxc-destroy.in src/lxc/lxc-destroy.in +2 -2

No files found.
--- a/src/lxc/lxc-destroy.in
+++ b/src/lxc/lxc-destroy.in
@@ -157,9 +157,9 @@ if ! lxc-info -n $lxc_name -P $lxc_path --state-is "STOPPED"; then
 fi

 # Deduce the type of rootfs
-# If LVM partition, destroy it. For btrfs, we delete the subvolue. If anything
+# If LVM partition, destroy it. For btrfs, we delete the subvolume. If anything
 # else, ignore it. We'll support deletion of others later.
-rootdev=`grep lxc.rootfs $lxc_path/$lxc_name/config 2>/dev/null | sed -e 's/^[^/]*//'`
+rootdev=`grep '^\s*lxc\.rootfs' $lxc_path/$lxc_name/config 2>/dev/null | sed -e 's/^[^/]*//'`
 if [ -n "$rootdev" ]; then
    if [ `verify_lvm $rootdev` = "lvm" ]; then
        if [ `busy_lvm $rootdev` = "busy" ]; then