- rename in conf.in files, update conf.in file still referencing mesh

diff --git a/bin/rename.sh b/bin/rename.sh
index 4234b8316479d93f28677d41132cc7d617783d24..3b49712e5a50cc5c7d528e42333434dc4b741e76 100755 (executable)
--- a/bin/rename.sh
+++ b/bin/rename.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-for n in `find * -name "*.c"` `find * -name "*.h"` `find * -name "*.am"` `find * -name "*.conf"`
+for n in `find * -name "*.c"` `find * -name "*.h"` `find * -name "*.am"` `find * -name "*.conf"`  `find * -name "*.conf.in"` 
 do
  cat $n | sed -e "s/$1/$2/g" > $n.new
  mv $n.new $n || echo "Move failed: $n.new to $n"

diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index 27b613c3d04ac19ed1eab5aca9bf571d5374383d..83582659af1fa7036e61c0f696b7df4fa2ea3e12 100644 (file)
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -5,7 +5,7 @@ HOSTNAME = localhost
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist dht nse mesh fs revocation
+DEFAULTSERVICES = topology hostlist dht nse cadet fs revocation
 # Special case, uses user runtime dir even for per-system service.
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-arm.sock
 UNIX_MATCH_UID = YES

diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in
index 5fbfd0b8d066ded242e21da89a91891c3fe57198..889a4ab4f145d5ca3c93a2c7fbabcd063e751091 100644 (file)
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -22,7 +22,7 @@ AUTOSTART = NO
 HOSTNAME = localhost
 AUTOSTART = NO
 
-[mesh]
+[cadet]
 AUTOSTART = NO
 
 [dht]