diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-15 07:51:11 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-15 07:51:11 +0000 |
| commit | 52144f7f3d47d0c88bdf25eaf7e831bf8ecd4223 (patch) | |
| tree | 1f6af829b2b4af25e20539f553f8a140911929ba /main/lxc/bb-rm.patch | |
| parent | 3cd85e98dcec98821e9c0d5c28f33f3ed2633db2 (diff) | |
| download | aports-52144f7f3d47d0c88bdf25eaf7e831bf8ecd4223.tar.bz2 aports-52144f7f3d47d0c88bdf25eaf7e831bf8ecd4223.tar.xz | |
main/lxc: upgrade to 0.9.0
Diffstat (limited to 'main/lxc/bb-rm.patch')
| -rw-r--r-- | main/lxc/bb-rm.patch | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/main/lxc/bb-rm.patch b/main/lxc/bb-rm.patch index b354d48c47..c93adb33a8 100644 --- a/main/lxc/bb-rm.patch +++ b/main/lxc/bb-rm.patch @@ -1,16 +1,15 @@ -diff --git a/src/lxc/lxc-destroy.in b/src/lxc/lxc-destroy.in -index 846266c..f8f4b48 100644 ---- a/src/lxc/lxc-destroy.in -+++ b/src/lxc/lxc-destroy.in -@@ -122,9 +122,9 @@ if [ -n "$rootdev" ]; then - btrfs subvolume delete "$rootdev" - else - # In case rootfs is not under $lxc_path/$lxc_name, remove it -- rm -rf --one-file-system --preserve-root $rootdev -+ find $rootdev -xdev -delete - fi - fi +--- ./src/lxc/lxc-destroy.in.orig 2013-04-15 07:38:58.383545701 +0000 ++++ ./src/lxc/lxc-destroy.in 2013-04-15 07:42:22.552123148 +0000 +@@ -137,10 +137,10 @@ + btrfs subvolume delete "$rootdev" + else + # In case rootfs is not under $lxc_path/$lxc_name, remove it +- rm -rf --one-file-system --preserve-root $rootdev ++ find $rootdev -xdev -delete + fi + fi fi + # recursively remove the container to remove old container configuration -rm -rf --one-file-system --preserve-root $lxc_path/$lxc_name +find $lxc_path/$lxc_name -xdev -delete |