mfeuer-new_scripts: Merged and modified release-0.4.0-yocto_makefile

30 files changed, 110 insertions, 88 deletions

diff --git a/Makefile b/Makefile
index 21462bb..64ad34c 100644
--- a/Makefile
+++ b/Makefile
@@ -62,8 +62,8 @@ rpm_tarball: rpmclean clean
 	tar czf /tmp/rvi_core-$(VERSION).tgz BUILD.md CONFIGURE.md doc \
 		LICENSE Makefile README.md rebar rebar.config rel \
 		RELEASE.md rpm scripts/setup_gen scripts/rvi \
-		scripts/rvi.service scripts/rvi_node.sh scripts/rvi.sh \
-		components rvi_sample.config scripts/setup_rvi_node.sh src \
+		scripts/rvi.service scripts/rvi.sh \
+		components priv/config/rvi_sample.config scripts/rvi_instball.sh src \
 		TODO 
 	mv /tmp/rvi-$(VERSION).tgz ./rpm/SOURCES/
 
@@ -74,4 +74,5 @@ rpm:	rpm_tarball
 install: # deps compile
 	./scripts/rvi_install.sh $(DESTDIR)/opt/rvi
 	install --mode=0755 -d $(DESTDIR)/etc/opt/rvi/
-	install --mode=0644 rvi_yocto.config $(DESTDIR)/etc/opt/rvi/rvi.config
+	install --mode=0644 priv/config/rvi_sample.config $(DESTDIR)/etc/opt/rvi/rvi_sample.config
+	install --mode=0644 priv/config/rvi_common.config $(DESTDIR)/opt/rvi/rvi_core/rvi_common.config
diff --git a/components/authorize/src/authorize_keys.erl b/components/authorize/src/authorize_keys.erl
index 1d205b6..70bb021 100644
--- a/components/authorize/src/authorize_keys.erl
+++ b/components/authorize/src/authorize_keys.erl
@@ -378,7 +378,7 @@ get_openssl_pub_key(File) ->
 				    publicExponent = E}
 	    end;
 	Error ->
-	    ?warning("Cannot read pub key ~p (~p)~n", [File, Error]),
+	    ?warning("Cannot read pub key ~p (~p). CWD: ~p~n", [File, Error, file:get_cwd()]),
 	    undefined
     end.
 
diff --git a/backend.config b/priv/config/rvi_backend.config
index 4c2ed57..4c2ed57 100644
--- a/backend.config
+++ b/priv/config/rvi_backend.config
diff --git a/rvi_sample.config b/priv/config/rvi_sample.config
index 0bd4488..a871a0f 100644
--- a/rvi_sample.config
+++ b/priv/config/rvi_sample.config
@@ -35,7 +35,7 @@ LogLevel = Env("RVI_LOGLEVEL", notice).
 
 [
  %% All erlang apps needed to fire up a node. Do not touch.
- {include_lib, "rvi_core/priv/config/rvi_common.config"},
+ {include_lib, "rvi_core/rvi_common.config"},
 
  %%
  %% Custom environment settings
@@ -113,10 +113,10 @@ LogLevel = Env("RVI_LOGLEVEL", notice).
    {rvi_core,
     [
 
-     {key_pair, {openssl_pem, "test_keys/insecure_device_key_priv.pem"}},
-     {provisioning_key, "test_keys/insecure_root_key_pub.pem"},
-     {authorize_jwt, "test_keys/insecure_device_key_pub_sign.jwt"},
-     {cert_dir, "test_certs"},
+     {key_pair, {openssl_pem, "rvi_core/priv/sample_keys/insecure_device_bkey_priv.pem"}},
+     {provisioning_key, "rvi_core/priv/sample_keys/insecure_root_key_pub.pem"},
+     {authorize_jwt, "rvi_core/priv/sample_keys/insecure_device_key_pub_sign.jwt"},
+     {cert_dir, "rvi_core/priv/sample_certs"},
 
      %% Specify the node address that data_link uses to listen to
      %% incoming traffic from other rvi nodes.
diff --git a/rvi_yocto.config b/priv/config/rvi_yocto.config
index 0bd4488..a871a0f 100644
--- a/rvi_yocto.config
+++ b/priv/config/rvi_yocto.config
@@ -35,7 +35,7 @@ LogLevel = Env("RVI_LOGLEVEL", notice).
 
 [
  %% All erlang apps needed to fire up a node. Do not touch.
- {include_lib, "rvi_core/priv/config/rvi_common.config"},
+ {include_lib, "rvi_core/rvi_common.config"},
 
  %%
  %% Custom environment settings
@@ -113,10 +113,10 @@ LogLevel = Env("RVI_LOGLEVEL", notice).
    {rvi_core,
     [
 
-     {key_pair, {openssl_pem, "test_keys/insecure_device_key_priv.pem"}},
-     {provisioning_key, "test_keys/insecure_root_key_pub.pem"},
-     {authorize_jwt, "test_keys/insecure_device_key_pub_sign.jwt"},
-     {cert_dir, "test_certs"},
+     {key_pair, {openssl_pem, "rvi_core/priv/sample_keys/insecure_device_bkey_priv.pem"}},
+     {provisioning_key, "rvi_core/priv/sample_keys/insecure_root_key_pub.pem"},
+     {authorize_jwt, "rvi_core/priv/sample_keys/insecure_device_key_pub_sign.jwt"},
+     {cert_dir, "rvi_core/priv/sample_certs"},
 
      %% Specify the node address that data_link uses to listen to
      %% incoming traffic from other rvi nodes.
diff --git a/test_certs/insecure_default_cert.json b/priv/sample_certs/insecure_default_cert.json
index f39f80b..f39f80b 100644
--- a/test_certs/insecure_default_cert.json
+++ b/priv/sample_certs/insecure_default_cert.json
diff --git a/test_certs/insecure_default_cert.jwt b/priv/sample_certs/insecure_default_cert.jwt
index 647eb84..647eb84 100644
--- a/test_certs/insecure_default_cert.jwt
+++ b/priv/sample_certs/insecure_default_cert.jwt
diff --git a/test_keys/insecure_device_key_priv.pem b/priv/sample_keys/insecure_device_key_priv.pem
index 89d47b4..89d47b4 100644
--- a/test_keys/insecure_device_key_priv.pem
+++ b/priv/sample_keys/insecure_device_key_priv.pem
diff --git a/test_keys/insecure_device_key_pub.pem b/priv/sample_keys/insecure_device_key_pub.pem
index 6d82a7e..6d82a7e 100644
--- a/test_keys/insecure_device_key_pub.pem
+++ b/priv/sample_keys/insecure_device_key_pub.pem
diff --git a/test_keys/insecure_device_key_pub_sign.jwt b/priv/sample_keys/insecure_device_key_pub_sign.jwt
index 32871fe..32871fe 100644
--- a/test_keys/insecure_device_key_pub_sign.jwt
+++ b/priv/sample_keys/insecure_device_key_pub_sign.jwt
diff --git a/test_keys/insecure_root_key_priv.pem b/priv/sample_keys/insecure_root_key_priv.pem
index a81e8be..a81e8be 100644
--- a/test_keys/insecure_root_key_priv.pem
+++ b/priv/sample_keys/insecure_root_key_priv.pem
diff --git a/test_keys/insecure_root_key_pub.pem b/priv/sample_keys/insecure_root_key_pub.pem
index bd203ef..bd203ef 100644
--- a/test_keys/insecure_root_key_pub.pem
+++ b/priv/sample_keys/insecure_root_key_pub.pem
diff --git a/priv/test_config/backend.config b/priv/test_config/backend.config
new file mode 100644
index 0000000..fe60836
--- /dev/null
+++ b/priv/test_config/backend.config
@@ -0,0 +1,17 @@
+%% -*- erlang -*-
+{ok, CurDir} = file:get_cwd().
+[
+ {include_lib, "rvi_core/priv/config/rvi_backend.config"},
+ {set_env,
+  [
+   {rvi_core,
+    [{key_pair, {openssl_pem, filename:join(
+				CurDir, "../basic_backend_keys/dev_priv.pem")}},
+     {provisioning_key,
+      {openssl_pem, filename:join(CurDir, "../root_keys/root_pub.pem")}},
+     {authorize_jwt, filename:join(
+		       CurDir, "../basic_backend_keys/dev_pub_sign.jwt")},
+     {cert_dir, filename:join(CurDir, "../basic_backend_certs")}
+    ]}
+  ]}
+].
diff --git a/test/config/basic_backend.config b/priv/test_config/basic_backend.config
index c4078e3..2a60627 100644
--- a/test/config/basic_backend.config
+++ b/priv/test_config/basic_backend.config
@@ -1,6 +1,6 @@
 %% -*- erlang -*-
 {ok, CurDir} = file:get_cwd().
 [
- {include_lib, "rvi_core/test/config/backend.config"},
+ {include_lib, "rvi_core/priv/test_config/backend.config"},
  {remove_apps, [bt, dlink_bt]}
 ].
diff --git a/test/config/basic_sample.config b/priv/test_config/basic_sample.config
index d91d235..56f9a4c 100644
--- a/test/config/basic_sample.config
+++ b/priv/test_config/basic_sample.config
@@ -1,6 +1,6 @@
 %% -*- erlang -*-
 {ok, CurDir} = file:get_cwd().
 [
- {include_lib, "rvi_core/test/config/sample.config"},
+ {include_lib, "rvi_core/priv/test_config/sample.config"},
  {remove_apps, [bt, dlink_bt]}
 ].
diff --git a/test/config/bt_backend.config b/priv/test_config/bt_backend.config
index 9ff0b9b..dfa7645 100644
--- a/test/config/bt_backend.config
+++ b/priv/test_config/bt_backend.config
@@ -1,6 +1,6 @@
 %% -*- erlang -*-
 [
- {include_lib, "rvi_core/test/config/backend.config"},
+ {include_lib, "rvi_core/priv/test_config/backend.config"},
  {remove_apps, [dlink_tcp, dlink_tls]},
 
  {set_env,
diff --git a/test/config/bt_sample.config b/priv/test_config/bt_sample.config
index 06dabf0..0159992 100644
--- a/test/config/bt_sample.config
+++ b/priv/test_config/bt_sample.config
@@ -1,6 +1,6 @@
 %% -*- erlang -*-
 [
- {include_lib, "rvi_core/test/config/sample.config"},
+ {include_lib, "rvi_core/priv/test_config/sample.config"},
  {remove_apps, [dlink_tcp, dlink_tls]},
  {set_env,
   [
diff --git a/priv/test_config/sample.config b/priv/test_config/sample.config
new file mode 100644
index 0000000..6a7c41c
--- /dev/null
+++ b/priv/test_config/sample.config
@@ -0,0 +1,20 @@
+%% -*- erlang -*-
+{ok, CurDir} = file:get_cwd().
+[
+ {include_lib, "rvi_core/priv/config/rvi_sample.config"},
+ {remove_apps, [bt, dlink_bt]},
+ {set_env,
+  [
+   {rvi_core,
+    [
+     {node_service_prefix, "jlr.com/vin/abc"},
+     {key_pair, {openssl_pem, filename:join(
+				CurDir, "../basic_sample_keys/dev_priv.pem")}},
+     {provisioning_key,
+      {openssl_pem, filename:join(CurDir, "../root_keys/root_pub.pem")}},
+     {authorize_jwt, filename:join(
+		       CurDir, "../basic_sample_keys/dev_pub_sign.jwt")},
+     {cert_dir, filename:join(CurDir, "../basic_sample_certs")}
+    ]}
+  ]}
+].
diff --git a/test/config/sms_backend.config b/priv/test_config/sms_backend.config
index 974fc2e..0958667 100644
--- a/test/config/sms_backend.config
+++ b/priv/test_config/sms_backend.config
@@ -1,6 +1,6 @@
 %% -*- erlang -*-
 [
- {include_lib, "rvi_core/test/config/backend.config"},
+ {include_lib, "rvi_core/priv/test_config/backend.config"},
  {set_env,
   [
    {gsms,
diff --git a/test/config/sms_sample.config b/priv/test_config/sms_sample.config
index 0e91186..336b806 100644
--- a/test/config/sms_sample.config
+++ b/priv/test_config/sms_sample.config
@@ -1,6 +1,6 @@
 %% -*- erlang -*-
 [
- {include_lib, "rvi_core/test/config/sample.config"},
+ {include_lib, "rvi_core/priv/test_config/sample.config"},
  {set_env,
   [
    {gsms,
diff --git a/test/config/tls_backend.config b/priv/test_config/tls_backend.config
index d2356f2..c5709ed 100644
--- a/test/config/tls_backend.config
+++ b/priv/test_config/tls_backend.config
@@ -1,6 +1,6 @@
 %% -*- erlang -*-
 [
- {include_lib, "rvi_core/test/config/backend.config"},
+ {include_lib, "rvi_core/priv/test_config/backend.config"},
  {set_env,
   [
    {rvi_core,
diff --git a/test/config/tls_sample.config b/priv/test_config/tls_sample.config
index 8559b8c..318bc27 100644
--- a/test/config/tls_sample.config
+++ b/priv/test_config/tls_sample.config
@@ -1,6 +1,6 @@
 %% -*- erlang -*-
 [
- {include_lib, "rvi_core/test/config/sample.config"},
+ {include_lib, "rvi_core/priv/test_config/sample.config"},
  {set_env,
   [
    {rvi_core,
diff --git a/rebar.config b/rebar.config
index 80cf4f3..f217849 100644
--- a/rebar.config
+++ b/rebar.config
@@ -22,7 +22,7 @@
 ]}.
 
 {ct_use_short_names, true}.
-{ct_extra_params, "-setcookie rvi_core"}.
+{ct_extra_params, "-setcookie rvi_cookie"}.
 
 {deps,
  [
diff --git a/scripts/rvi.sh b/scripts/rvi.sh
index fe9cd01..eee8b5b 100755
--- a/scripts/rvi.sh
+++ b/scripts/rvi.sh
@@ -21,7 +21,7 @@ usage() {
     echo "       start|stop|console|attach|ping"
     echo
     echo "  -c config_file  Configuration file to launch rvi node with. "
-    echo "                  If omitted the rvi.config in the configuration "
+    echo "                  If omitted the rvi_sample.config in the configuration "
     echo "                  directory will be used."
     echo
     echo "  -s short_name   Erlang node short name. Defaults to 'rvi_core'"
@@ -36,15 +36,15 @@ usage() {
     echo "                  Defaults to '/tmp/rvi/[config]/log' where [config]"
     echo "                  is the base name of the configuration file."
     echo
-    echo "  start           Start an rvi node with the given configuration file."
+    echo "  console [defaut]  Start an rvi in foreground mode."
+    echo 
+    echo "  start             Start an rvi node with the given configuration file."
     echo
-    echo "  stop            Stop an rvi node previously started with 'start'."
+    echo "  stop              Stop an rvi node previously started with 'start'."
     echo
-    echo "  console         Start an rvi in foreground mode."
-    echo 
-    echo "  attach          Attach to an rvi node previously started with 'start'."
+    echo "  attach            Attach to an rvi node previously started with 'start'."
     echo
-    echo "  ping            Ping to check if an rvi node is up. Returns 0 if up."
+    echo "  ping              Ping to check if an rvi node is up. Returns 0 if up."
     exit 1
 }
 
@@ -80,15 +80,26 @@ done
 CONFIG_DIR=${CONFIG_DIR:=/etc/opt/rvi}
 
 shift $((${OPTIND}-1))
-CMD=$1
 
-if [ "${CMD}" != "start" -a "${CMD}" != "stop" -a  "${CMD}" != "console" -a  "${CMD}" != "ping" ]
+if [ "${#}" = "0" ]
+then
+    CMD="console"
+else
+    CMD=$1
+fi
+
+if [ "${CMD}" != "start" -a "${CMD}" != "attach" -a "${CMD}" != "stop" -a  "${CMD}" != "console" -a  "${CMD}" != "ping" ]
 then
     usage
 fi
 
 export ERL_LIBS=${SELF_DIR}/rvi_core:${SELF_DIR}/rvi_core/deps:${SELF_DIR}/rvi_core/components
 
+# Convert config dir to abs path
+if [ $(echo ${CONFIG_DIR} | cut -c 1,1) != "/" ]
+then
+    CONFIG_DIR=${PWD}/${CONFIG_DIR}
+fi
 
 # Check that we have a config dir
 if [ ! -d ${CONFIG_DIR} ]
@@ -109,7 +120,7 @@ fi
 if [ ${CMD} = "start" -o ${CMD} = "console" ]
 then
     # Default to rvi.config
-    CONFIG_FILE=${CONFIG_FILE:=${CONFIG_DIR}/rvi.config}
+    CONFIG_FILE=${CONFIG_FILE:=${CONFIG_DIR}/rvi_sample.config}
     #
     # Check if we need to prepend current dir
     # to relative config file path
@@ -152,10 +163,12 @@ case "${CMD}" in
    start)
 	 install -d --mode 0755  ${TMP_DIR}
 	 install -d --mode 0755  ${LOG_DIR}
+	 cd ${SELF_DIR}
 	 exec run_erl -daemon ${TMP_DIR}/ ${LOG_DIR} "exec ${LAUNCH}"
 	 ;;
 
    console)
+       cd ${SELF_DIR}
        exec ${LAUNCH}
        ;;
 
diff --git a/scripts/rvi_create_certificate.py b/scripts/rvi_create_certificate.py
index e4d5b0b..6e09fdc 100755
--- a/scripts/rvi_create_certificate.py
+++ b/scripts/rvi_create_certificate.py
@@ -239,7 +239,7 @@ encoded = jwt.encode(cert, root_key.exportKey("PEM"), algorithm='RS256')
 
 # Validate
 try:
-    jwt.decode(encoded, root_key.publickey().exportKey("PEM"), algorithm='RS256')
+    jwt.decode(encoded, root_key.publickey().exportKey("PEM"))
 except:
     print "FAILED: Could not verify signed JSON Web Token using public part of"
     print "        root key {}".format(root_key_fname)
diff --git a/scripts/rvi_create_device_key.py b/scripts/rvi_create_device_key.py
index 59f671e..060ea8b 100755
--- a/scripts/rvi_create_device_key.py
+++ b/scripts/rvi_create_device_key.py
@@ -124,7 +124,7 @@ signature = jwt.encode(key_obj, priv_root_key.exportKey('PEM'), algorithm='RS256
 pub_root_key = priv_root_key.publickey().exportKey('PEM')
 
 try: 
-    jwt.decode(signature, pub_root_key, algorithm='RS256')
+    jwt.decode(signature, pub_root_key)
 except:
     print "FAILED VERIFICATION!"
     print "The public portion of the generated device key, signed by the provided private root key,"
diff --git a/scripts/setup_gen b/scripts/setup_gen
index 999d38e..1d90585 100755
--- a/scripts/setup_gen
+++ b/scripts/setup_gen
diff --git a/test/config/backend.config b/test/config/backend.config
deleted file mode 100644
index 3a7be0b..0000000
--- a/test/config/backend.config
+++ /dev/null
@@ -1,17 +0,0 @@
-%% -*- erlang -*-
-{ok, CurDir} = file:get_cwd().
-[
- {include_lib, "rvi_core/backend.config"},
- {set_env,
-  [
-   {rvi_core,
-    [{key_pair, {openssl_pem, filename:join(
-				CurDir, "basic_backend_keys/dev_priv.pem")}},
-     {provisioning_key,
-      {openssl_pem, filename:join(CurDir, "root_keys/root_pub.pem")}},
-     {authorize_jwt, filename:join(
-		       CurDir, "basic_backend_keys/dev_pub_sign.jwt")},
-     {cert_dir, filename:join(CurDir, "basic_backend_certs")}
-    ]}
-  ]}
-].
diff --git a/test/config/sample.config b/test/config/sample.config
deleted file mode 100644
index efdf0ca..0000000
--- a/test/config/sample.config
+++ /dev/null
@@ -1,20 +0,0 @@
-%% -*- erlang -*-
-{ok, CurDir} = file:get_cwd().
-[
- {include_lib, "rvi_core/rvi_sample.config"},
- {remove_apps, [bt, dlink_bt]},
- {set_env,
-  [
-   {rvi_core,
-    [
-     {node_service_prefix, "jlr.com/vin/abc"},
-     {key_pair, {openssl_pem, filename:join(
-				CurDir, "basic_sample_keys/dev_priv.pem")}},
-     {provisioning_key,
-      {openssl_pem, filename:join(CurDir, "root_keys/root_pub.pem")}},
-     {authorize_jwt, filename:join(
-		       CurDir, "basic_sample_keys/dev_pub_sign.jwt")},
-     {cert_dir, filename:join(CurDir, "basic_sample_certs")}
-    ]}
-  ]}
-].
diff --git a/test/rvi_core_SUITE.erl b/test/rvi_core_SUITE.erl
index c154eee..41aa15a 100644
--- a/test/rvi_core_SUITE.erl
+++ b/test/rvi_core_SUITE.erl
@@ -156,7 +156,7 @@ t_sample_keys_and_cert(Config) ->
 
 t_install_backend_node(Config) ->
     install_rvi_node("basic_backend", env(),
-		     [root(), "/test/config/basic_backend.config"]).
+		     [root(), "/priv/test_config/basic_backend.config"]).
 
 
 t_install_sample_node(_Config) ->
@@ -164,54 +164,54 @@ t_install_sample_node(_Config) ->
 
 t_install_sms_backend_node(_Config) ->
     install_rvi_node("sms_backend", env(),
-		     [root(), "/test/config/sms_backend.config"]).
+		     [root(), "/priv/test_config/sms_backend.config"]).
 
 t_install_sms_sample_node(_Config) ->
     install_sample_node("sms_sample", "sms_sample.config").
 
 t_install_tls_backend_node(_Config) ->
     install_rvi_node("tls_backend", env(),
-		     [root(), "/test/config/tls_backend.config"]).
+		     [root(), "/priv/test_config/tls_backend.config"]).
 
 t_install_tls_sample_node(_Config) ->
     install_sample_node("tls_sample", "tls_sample.config").
 
 t_install_bt_backend_node(_Config) ->
     install_rvi_node("bt_backend", env(),
-		     [root(), "/test/config/bt_backend.config"]).
+		     [root(), "/priv/test_config/bt_backend.config"]).
 
 t_install_bt_sample_node(_Config) ->
     install_sample_node("bt_sample", "bt_sample.config").
 
 t_start_basic_backend(_Config) ->
-    cmd([scripts(), "/rvi_node.sh -d -n basic_backend"]),
+    cmd(["./basic_backend/rvi.sh -s basic_backend -l ./basic_backend/rvi/log -d ./basic_backend -c ./basic_backend/priv/test_config/basic_backend.config start"]),
     await_started("basic_backend"),
     ok.
 
 t_start_basic_sample(_Config) ->
-    cmd([scripts(), "/rvi_node.sh -d -n basic_sample"]),
+    cmd(["./basic_sample/rvi.sh -s basic_sample -l ./basic_sample/rvi/log -d ./basic_sample -c ./basic_sample/priv/test_config/basic_sample.config start"]),
     await_started("basic_sample"),
     ok.
 
 t_start_bt_backend(_Config) ->
-    cmd([scripts(), "/rvi_node.sh -d -n bt_backend"]),
+    cmd(["./bt_backend/rvi.sh -s bt_backend -l ./bt_backend/rvi/log -d ./bt_backend -c ./bt_backend/priv/test_config/bt_backend.config start"]),
     await_started("bt_backend"),
     ok.
 
 t_start_bt_sample(_Config) ->
-    cmd([scripts(), "/rvi_node.sh -d -n bt_sample"]),
+    cmd(["./bt_sample/rvi.sh -s bt_sample -l ./bt_sample/rvi/log -d ./bt_sample -c ./bt_sample/priv/test_config/bt_sample.config start"]),
     await_started("bt_sample"),
     ok.
 
 t_start_tls_backend(_Config) ->
-    cmd([scripts(), "/rvi_node.sh -d -n tls_backend"]),
+    cmd(["./tls_backend/rvi.sh -s tls_backend -l ./tls_backend/rvi/log -d ./tls_backend -c ./tls_backend/priv/test_config/tls_backend.config start"]),
     await_started("tls_backend"),
     ok.
 
 t_start_tls_sample(_Config) ->
-    cmd([scripts(), "/rvi_node.sh -d -n tls_sample"]),
+    cmd(["./tls_sample/rvi.sh -s tls_sample -l ./tls_sample/rvi/log -d ./tls_sample -c ./tls_sample/priv/test_config/tls_sample.config start"]),
     await_started("tls_sample"),
-    ok.
+    ok. 
 
 t_register_lock_service(_Config) ->
     Pid =
@@ -427,19 +427,27 @@ install_rvi_node(Name, Env, ConfigF) ->
     Scripts = filename:join(Root, "scripts"),
     ct:log("Root = ~p", [Root]),
     Cmd = lists:flatten(
-	    [Env, " ", Scripts, "/setup_rvi_node.sh -d -n ", Name,
-	     " -c ", ConfigF]),
+	    [Env, " ", Scripts, "/rvi_install.sh ./", Name]),
+
     ct:log("Cmd = `~s`", [Cmd]),
     Res = cmd(Cmd),
     ct:log("install_rvi_node/1 -> ~p", [Res]),
-    Res.
+
+    
+    Res1 = cmd(lists:flatten(["install -d --mode 0755 ./", Name])),
+    ct:log("install_rvi_node/2 -> ~p", [Res1]),
+
+    Res2 = cmd(lists:flatten(["cp -r ", Root, "/priv ", Name])),
+    ct:log("install_rvi_node/3 -> ~p", [Res2]),
+
+    Res2.
 
 install_sample_node(Name, ConfigF) ->
     Env = [env(),
 	   " RVI_BACKEND=127.0.0.1 RVI_PORT=9000"
 	   " RVI_MY_NODE_ADDR=127.0.0.1:9000"],
     install_rvi_node(Name, Env,
-		     [root(), "/test/config/", ConfigF]).
+		     [root(), "/priv/test_config/", ConfigF]).
 
 in_priv_dir(F, Cfg) ->
     %% PrivDir = ?config(priv_dir, Cfg),
@@ -572,7 +580,7 @@ no_errors(Dirs, PDir) ->
     ct:log("Will check errors in ~p", [Dirs]),
     true = lists:all(
 	     fun(D) ->
-		     no_errors_(filename:join([PDir, D, "log", "lager"]), D)
+		     no_errors_(filename:join([PDir, D, "rvi", "log", "lager"]), D)
 	     end, Dirs),
     ok.