rename: invert old and new instance name

For compatibility with what ganeti internally does the name passed in
INSTANCE_NAME is the new one, and the old one is passed in
OLD_INSTANCE_NAME.

Reviewed-by: iustinp

diff --git a/common.sh b/common.sh
index c541aa1..62cea59 100644 (file)
--- a/common.sh
+++ b/common.sh
@@ -6,9 +6,9 @@ get_api5_arguments() {
   eval set -- "$TEMP"
   while true; do
     case "$1" in
-      -i|-o) instance=$2; shift 2;;
+      -i|-n) instance=$2; shift 2;;
 
-      -n) new_name=$2; shift 2;;
+      -o) old_name=$2; shift 2;;
 
       -b) blockdev=$2; shift 2;;
 

diff --git a/rename b/rename
index d7cf756..81fda06 100755 (executable)
--- a/rename
+++ b/rename
@@ -38,18 +38,18 @@ MNAME="$TMPDIR/etc/mailname"
 # for hostname, we raise and error if the old hostname is not what we
 # expect
 OLD_HNAME="`cat $HNAME`"
-if [ "$OLD_HNAME" = "$instance" ]; then
-       echo $new_name > $HNAME
+if [ "$OLD_HNAME" = "$old_name" ]; then
+       echo $instance > $HNAME
 else
-       echo "Cannot rename from $instance to $new_name:" 1>&2
+       echo "Cannot rename from $old_name to $instance:" 1>&2
        echo "Instance has a different hostname ($OLD_HNAME)" 1>&2
        exit 1
 fi
 
 # for mailname, we rename only if it has the old name, otherwise we
 # ignore it (and assumme that it's a customized name)
-if [ "`cat $MNAME`" = "$instance" ]; then
-       echo $new_name > $MNAME
+if [ "`cat $MNAME`" = "$old_name" ]; then
+       echo $instance > $MNAME
 fi
 
 umount $TMPDIR