From 4fa22bfca1e94393aa3fbdc3fdf5516e75d47521 Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Wed, 24 Apr 2013 15:16:21 -0500 Subject: [PATCH] lxc-create: cleanup whenever exiting with error MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Otherwise we leave bad containers sitting around and further confuse things on retries. Reported-by: Mukanyiligira Didacienne Signed-off-by: Serge Hallyn Acked-by: Stéphane Graber --- src/lxc/lxc-create.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lxc/lxc-create.in b/src/lxc/lxc-create.in index fbb566f63..553ffd271 100644 --- a/src/lxc/lxc-create.in +++ b/src/lxc/lxc-create.in @@ -286,7 +286,7 @@ fi if [ ! -r "$lxc_config" ]; then echo "$(basename $0): '$lxc_config' configuration file not found" >&2 - exit 1 + cleanup fi if [ ! -z "$lxc_template" ]; then @@ -317,11 +317,11 @@ echo "" >> $lxc_path/$lxc_name/config if [ -n "$custom_rootfs" ]; then if grep -q "lxc.rootfs" $lxc_path/$lxc_name/config ; then echo "configuration file already specifies a lxc.rootfs" - exit 1 + cleanup fi if [ -d "$custom_rootfs" ]; then echo "specified rootfs ($custom_rootfs) already exists. Bailing." - exit 1 + cleanup fi echo "lxc.rootfs = $custom_rootfs" >> $lxc_path/$lxc_name/config fi @@ -329,9 +329,9 @@ fi # Create the fs as needed if [ "$backingstore" = "lvm" ]; then [ -d "$rootfs" ] || mkdir $rootfs - lvcreate -L $fssize -n $lvname $vgname || exit 1 + lvcreate -L $fssize -n $lvname $vgname || cleanup udevadm settle - mkfs -t $fstype $rootdev || exit 1 + mkfs -t $fstype $rootdev || cleanup mount -t $fstype $rootdev $rootfs fi -- 2.47.2