diff --git a/seed/base-machine/dictionaries/12-base.xml b/seed/base-machine/dictionaries/12-base.xml
index f2dbdf3e..b81e59c8 100644
--- a/seed/base-machine/dictionaries/12-base.xml
+++ b/seed/base-machine/dictionaries/12-base.xml
@@ -9,6 +9,7 @@
False
+
diff --git a/seed/base-machine/funcs/funcs.py b/seed/base-machine/funcs/funcs.py
index 8e67ffdc..11cbcccd 100644
--- a/seed/base-machine/funcs/funcs.py
+++ b/seed/base-machine/funcs/funcs.py
@@ -9,7 +9,7 @@ from os import makedirs as _makedirs
#from risotto.utils import ZONES_SERVER
-_HERE = _dirname(_abspath(__main__.__file__))
+_HERE = _dirname(_dirname(_abspath(__main__.__file__)))
_PASSWORD_DIR = _join(_HERE, 'password')
diff --git a/seed/base-machine/manual/install/install_machine b/seed/base-machine/manual/install/install_machine
index d6aec7b6..0c38aca1 100755
--- a/seed/base-machine/manual/install/install_machine
+++ b/seed/base-machine/manual/install/install_machine
@@ -2,6 +2,7 @@
HOST_NAME=$1
IMAGE_NAME=$2
MACHINE=$3
+exit 0
. config.sh
. config_machine.sh
if [ -z "$MACHINE" ]; then
@@ -40,24 +41,25 @@ fi
if [ "$NEW_CONF" = true ]; then
echo " - delete old settings"
./diff.py "$MACHINE" "$MACHINE_RISOTTO_CONFIG_DIR" "$MACHINE_RISOTTO_CONFIG_DIR_LOCAL" > "$MACHINE_RISOTTO_CONFIG_DIR"_changelog.md
- rm -rf "$MACHINE_RISOTTO_CONFIG_DIR"
+# rm -rf "$MACHINE_RISOTTO_CONFIG_DIR"
fi
-cp -a "$MACHINE_NAME_NSPAWN_LOCAL" "$MACHINE_NAME_NSPAWN"
-cp -a "$MACHINE_NAME_SCRIPT_LOCAL" "$MACHINE_NAME_SCRIPT"
-if [ ! -d "$MACHINE_RISOTTO_CONFIG_DIR" ]; then
- cp -a "$MACHINE_RISOTTO_CONFIG_DIR_LOCAL" "$MACHINE_RISOTTO_CONFIG_DIR"
-fi
-if [ ! -d "$MACHINE_RISOTTO_SRV_DIR" ] && [ -d "$MACHINE_RISOTTO_SRV_DIR_LOCAL" ]; then
- mkdir -p "$MACHINE_RISOTTO_SRV_DIR"
-fi
-mkdir -p "$RISOTTO_JOURNALD_DIR"
+#cp -a "$MACHINE_NAME_NSPAWN_LOCAL" "$MACHINE_NAME_NSPAWN"
+#cp -a "$MACHINE_NAME_SCRIPT_LOCAL" "$MACHINE_NAME_SCRIPT"
+#if [ ! -d "$MACHINE_RISOTTO_CONFIG_DIR" ]; then
+# cp -a "$MACHINE_RISOTTO_CONFIG_DIR_LOCAL" "$MACHINE_RISOTTO_CONFIG_DIR"
+#fi
+#if [ ! -d "$MACHINE_RISOTTO_SRV_DIR" ] && [ -d "$MACHINE_RISOTTO_SRV_DIR_LOCAL" ]; then
+# mkdir -p "$MACHINE_RISOTTO_SRV_DIR"
+#fi
+#mkdir -p "$RISOTTO_JOURNALD_DIR"
if [ ! -d "$MACHINE_MACHINES_DIR" ]; then
cd "$MACHINES_DIR"
+ mkdir "$IMAGE_NAME"
+ cd "$IMAGE_NAME"
tar xf "$IMAGE_NAME_RISOTTO_IMAGE_NAME"
mkdir -p "$SHA_MACHINE_DIR"
cp -a "$IMAGE_NAME_RISOTTO_IMAGE_NAME".sha "$SHA_MACHINE"
- mv "$IMAGE_NAME" "$MACHINE_MACHINES_DIR"
cd - > /dev/null
fi