OSDN Git Service

Check on container name where it does not exist in stop operation.
authorHideyuki Niwa <niwa.hideyuki@jp.fujitsu.com>
Mon, 3 Feb 2014 01:44:41 +0000 (10:44 +0900)
committerHideyuki Niwa <niwa.hideyuki@jp.fujitsu.com>
Mon, 3 Feb 2014 01:44:41 +0000 (10:44 +0900)
If the container name for which stop is specified does not exist,
the error message is produced.

lxcf/lib/lxcf-stop
lxcf/package/RPMS/x86_64/lxcf-0.1-2.x86_64.rpm [deleted file]
lxcf/package/RPMS/x86_64/lxcf-0.1-3.x86_64.rpm [new file with mode: 0644]
lxcf/package/RPMS/x86_64/lxcf-debuginfo-0.1-2.x86_64.rpm [deleted file]
lxcf/package/RPMS/x86_64/lxcf-debuginfo-0.1-3.x86_64.rpm [new file with mode: 0644]
lxcf/package/SOURCES/lxcf-0.1.tar.gz
lxcf/package/SRPMS/lxcf-0.1-2.src.rpm [deleted file]
lxcf/package/SRPMS/lxcf-0.1-3.src.rpm [new file with mode: 0644]

index 283a11c..56740fb 100755 (executable)
@@ -43,11 +43,17 @@ lxcf_stop1() {
     exit 1
   fi
 
-  echo $LXCNAME "is being shutdown"
 
   LSTATE=`LANG=C virsh -c lxc:/// list | /usr/bin/awk '($2 == "'${LXCNAME}'"){print $3}'`
 
-  if [ ${LSTATE} == "paused" ] ; then
+  if [ x${LSTATE} == x ] ; then
+       echo $LXCNAME "is not a container name that does not exist."
+       exit -1
+  fi
+
+  echo $LXCNAME "is being shutdown"
+
+  if [ x${LSTATE} == x"paused" ] ; then
        /usr/bin/virsh -c lxc:/// resume ${LXCNAME} >& /dev/null
   fi
 
diff --git a/lxcf/package/RPMS/x86_64/lxcf-0.1-2.x86_64.rpm b/lxcf/package/RPMS/x86_64/lxcf-0.1-2.x86_64.rpm
deleted file mode 100644 (file)
index 12a53c1..0000000
Binary files a/lxcf/package/RPMS/x86_64/lxcf-0.1-2.x86_64.rpm and /dev/null differ
diff --git a/lxcf/package/RPMS/x86_64/lxcf-0.1-3.x86_64.rpm b/lxcf/package/RPMS/x86_64/lxcf-0.1-3.x86_64.rpm
new file mode 100644 (file)
index 0000000..40b042a
Binary files /dev/null and b/lxcf/package/RPMS/x86_64/lxcf-0.1-3.x86_64.rpm differ
diff --git a/lxcf/package/RPMS/x86_64/lxcf-debuginfo-0.1-2.x86_64.rpm b/lxcf/package/RPMS/x86_64/lxcf-debuginfo-0.1-2.x86_64.rpm
deleted file mode 100644 (file)
index 145b563..0000000
Binary files a/lxcf/package/RPMS/x86_64/lxcf-debuginfo-0.1-2.x86_64.rpm and /dev/null differ
diff --git a/lxcf/package/RPMS/x86_64/lxcf-debuginfo-0.1-3.x86_64.rpm b/lxcf/package/RPMS/x86_64/lxcf-debuginfo-0.1-3.x86_64.rpm
new file mode 100644 (file)
index 0000000..7ac59a4
Binary files /dev/null and b/lxcf/package/RPMS/x86_64/lxcf-debuginfo-0.1-3.x86_64.rpm differ
index 7c7d9ad..6bb696c 100644 (file)
Binary files a/lxcf/package/SOURCES/lxcf-0.1.tar.gz and b/lxcf/package/SOURCES/lxcf-0.1.tar.gz differ
diff --git a/lxcf/package/SRPMS/lxcf-0.1-2.src.rpm b/lxcf/package/SRPMS/lxcf-0.1-2.src.rpm
deleted file mode 100644 (file)
index 0a9700f..0000000
Binary files a/lxcf/package/SRPMS/lxcf-0.1-2.src.rpm and /dev/null differ
diff --git a/lxcf/package/SRPMS/lxcf-0.1-3.src.rpm b/lxcf/package/SRPMS/lxcf-0.1-3.src.rpm
new file mode 100644 (file)
index 0000000..92c6bc3
Binary files /dev/null and b/lxcf/package/SRPMS/lxcf-0.1-3.src.rpm differ