When cntl-c is pushed sysgen, clone and erase on the way,

the container under making is deleted.

diff --git a/lxcf/lib/lxcf-clone b/lxcf/lib/lxcf-clone
index afd660c..9466c8c 100755 (executable)
--- a/lxcf/lib/lxcf-clone
+++ b/lxcf/lib/lxcf-clone
@@ -133,6 +133,8 @@ lxcf_clone1() {
        exit 1
   fi 
 
+  trap '/usr/lib/lxcf/lxcf-erase ${LXCNAME};exit 1' 2
+
   # new container dir
   mkdir -p /etc/lxcf/rsc/${LXCNAME}
 

diff --git a/lxcf/lib/lxcf-erase b/lxcf/lib/lxcf-erase
index 7c3656e..8b1fffc 100755 (executable)
--- a/lxcf/lib/lxcf-erase
+++ b/lxcf/lib/lxcf-erase
@@ -58,7 +58,7 @@ lxcf_erase1() {
 #  fi
 
   # ctrl-c
-  trap '/usr/lib/lxcf/lxcf-erase ${LXCNAME} ' 2
+  trap '/usr/lib/lxcf/lxcf-erase ${LXCNAME}; exit 0' 2
 
   # check container state
   LXCSTATE=`LANG=C virsh -c lxc:/// list | /usr/bin/awk '($2 == "'${LXCNAME}'"){print $3}'`

diff --git a/lxcf/lib/lxcf-sysgen b/lxcf/lib/lxcf-sysgen
index 5dac60d..8fc2365 100755 (executable)
--- a/lxcf/lib/lxcf-sysgen
+++ b/lxcf/lib/lxcf-sysgen
@@ -129,7 +129,7 @@ lxcf_sysgen1() {
   fi 
 
   echo "Generate" ${LXCNAME}
-  trap '/usr/lib/lxcf/lxcf-erase ${LXCNAME};exit' 2
+  trap '/usr/lib/lxcf/lxcf-erase ${LXCNAME};exit 1' 2
 
   # set symbolic link for -p option
   if [ $FLG_P -eq 1 ] ; then