Fix execution group of NodeD
authorMichele Tartara <mtartara@google.com>
Wed, 5 Feb 2014 17:46:32 +0000 (17:46 +0000)
committerMichele Tartara <mtartara@google.com>
Wed, 5 Feb 2014 17:51:40 +0000 (18:51 +0100)
The Node deamon was executed with the wrong gid (gnt-daemons) instead of the one
assigned to it by configure.ac.

Fixes Issue 707.

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

Makefile.am
daemons/daemon-util.in

index e060963..2c87d77 100644 (file)
@@ -1667,6 +1667,7 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
          echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \
          echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
          echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
+         echo 's#@''GNTNODEDGROUP@#$(NODED_GROUP)#g'; \
          echo 's#@''GNTLUXIDGROUP@#$(LUXID_GROUP)#g'; \
          echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
          echo 's#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \
index 9497c60..653f765 100644 (file)
@@ -91,7 +91,7 @@ _daemon_usergroup() {
       echo "@GNTRAPIUSER@:@GNTRAPIGROUP@"
       ;;
     noded)
-      echo "@GNTNODEDUSER@:@GNTDAEMONSGROUP@"
+      echo "@GNTNODEDUSER@:@GNTNODEDGROUP@"
       ;;
     mond)
       echo "@GNTMONDUSER@:@GNTMONDGROUP@"