diff --git a/os/debian/postinst b/os/debian/postinst index 90ecf1a079048cc8197f1080f553c6537d20d1d1..6ca173c2785dcb0c844339c9b3ac1bf41426e288 100755 --- a/os/debian/postinst +++ b/os/debian/postinst @@ -98,19 +98,25 @@ NET_NAME="raiden" db_get cellframe-node/raiden_enabled || true if [ "$RET" = "true" ]; then DAP_CFG_NET="$DAP_PREFIX/etc/network/$NET_NAME.cfg" - DAP_CFG_NET_TPL="$DAP_PREFIX/share/configs/network/$NET_NAME.cfg.tpl" - DAP_NET_CFG="" if [ -e "$DAP_CFG_NET" ]; then - DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg.dpkg-new" - else - DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg" + mv "$DAP_CFG_NET" "$DAP_CFG_NET".dis + echo "[*] Disabled raiden" fi - cat $DAP_CFG_NET_TPL > $DAP_NET_CFG || true - db_get cellframe-node/raiden_node_type || true - NODE_TYPE=$RET - sed -i "s/{NODE_TYPE}/$NODE_TYPE/g" $DAP_NET_CFG || true - echo "[*] Enabled raiden" +# DAP_CFG_NET="$DAP_PREFIX/etc/network/$NET_NAME.cfg" +# DAP_CFG_NET_TPL="$DAP_PREFIX/share/configs/network/$NET_NAME.cfg.tpl" +# DAP_NET_CFG="" +# if [ -e "$DAP_CFG_NET" ]; then +# DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg.dpkg-new" +# else +# DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg" +# fi +# +# cat $DAP_CFG_NET_TPL > $DAP_NET_CFG || true +# db_get cellframe-node/raiden_node_type || true +# NODE_TYPE=$RET +# sed -i "s/{NODE_TYPE}/$NODE_TYPE/g" $DAP_NET_CFG || true +# echo "[*] Enabled raiden" fi # Init raiden diff --git a/scripts/create_configs_from_tpl.sh b/scripts/create_configs_from_tpl.sh index 56df22f13c7e072dc18d280c2791912b7b934626..61c9beab43e6636d6597b12743577169d5c1c05a 100755 --- a/scripts/create_configs_from_tpl.sh +++ b/scripts/create_configs_from_tpl.sh @@ -109,18 +109,25 @@ fi NET_NAME="raiden" if [ "$DAP_RAIDEN_ENABLED" = "true" ]; then + DAP_CFG_NET="$DAP_PREFIX/etc/network/$NET_NAME.cfg" - DAP_CFG_NET_TPL="$DAP_PREFIX/share/configs/network/$NET_NAME.cfg.tpl" - DAP_NET_CFG="" if [ -e "$DAP_CFG_NET" ]; then - DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg.new" - else - DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg" + mv "$DAP_CFG_NET" "$DAP_CFG_NET".dis + echo "[*] Disabled raiden" fi - cat $DAP_CFG_NET_TPL > $DAP_NET_CFG || true - sed -i .old "s/{NODE_TYPE}/$DAP_RAIDEN_ROLE/" $DAP_NET_CFG || true - rm $DAP_NET_CFG.old +# DAP_CFG_NET="$DAP_PREFIX/etc/network/$NET_NAME.cfg" +# DAP_CFG_NET_TPL="$DAP_PREFIX/share/configs/network/$NET_NAME.cfg.tpl" +# DAP_NET_CFG="" +# if [ -e "$DAP_CFG_NET" ]; then +# DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg.new" +# else +# DAP_NET_CFG="$DAP_PREFIX/etc/network/$NET_NAME.cfg" +# fi +# +# cat $DAP_CFG_NET_TPL > $DAP_NET_CFG || true +# sed -i .old "s/{NODE_TYPE}/$DAP_RAIDEN_ROLE/" $DAP_NET_CFG || true +# rm $DAP_NET_CFG.old fi diff --git a/version.mk b/version.mk index 63adc9058492ee29886447623e6f4852a19d0b33..a7d578e934287808c432e57765afb005f1f43b1a 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ VERSION_MAJOR=5 VERSION_MINOR=2 -VERSION_PATCH=257 +VERSION_PATCH=258