2 files changed, 8 insertions, 1 deletions
diff --git a/TODO.md b/TODO.md
index 4096bfc..f1e107d 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,7 +1,6 @@
 # TODO
 
 * A `kvmxctl`, `kvmx-host` or `kvmx-supervisor` to control VMs from all users in the system.
-* How to handle `$datadir` when VM is cloned or moved? Maybe just warn the user to do manual config change.
 * Fix isolinux support:
   * http://www.syslinux.org/wiki/index.php?title=Development/Testing
   * http://linux-kernel-driver.blogspot.com.br/2009/06/linux-kernel-development-using.html
diff --git a/kvmx b/kvmx
index 6ef4992..b132f56 100755
--- a/kvmx
+++ b/kvmx
@@ -1024,6 +1024,10 @@ function kvmx_clone {
     mv $FOLDER/ssh/$VM.key     $FOLDER/ssh/$DEST.key
     mv $FOLDER/ssh/$VM.key.pub $FOLDER/ssh/$DEST.key.pub
   fi
+
+  if [ "$DATADIR" != "$STORAGE" ]; then
+    echo "$BASENAME: please copy datadir $DATADIR manually"
+  fi
 }
 
 # Alias to clone
@@ -1474,6 +1478,10 @@ function kvmx_rename {
     mv $FOLDER/ssh/$VM.key     $FOLDER/ssh/$DEST.key
     mv $FOLDER/ssh/$VM.key.pub $FOLDER/ssh/$DEST.key.pub
   fi
+
+  if [ "$DATADIR" != "$STORAGE" ]; then
+    echo "$BASENAME: please move datadir $DATADIR manually"
+  fi
 }
 
 # Alias to rename