diff options
| author | Quentin Young <qlyoung@users.noreply.github.com> | 2020-05-19 13:53:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 13:53:20 -0400 |
| commit | ac823c10c779301af18b0f1258f2183a41e576cf (patch) | |
| tree | fc6e8176741c468c61bf620e6a93528555ac1f1f | |
| parent | 1c5f37a12a5bea1b14f815afc5de172d15b8e516 (diff) | |
| parent | 0deb004ca86e0bce693bdbecc23f40d94ddbbb2a (diff) | |
Merge pull request #6396 from opensourcerouting/6.0/init-config-permsstable/6.0
[6.0] build: use configfile mode in init script
| -rwxr-xr-x | configure.ac | 1 | ||||
| -rwxr-xr-x | tools/frr.in | 2 | ||||
| -rw-r--r-- | tools/frrcommon.sh.in | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index ef76b5b209..79618c583a 100755 --- a/configure.ac +++ b/configure.ac @@ -704,6 +704,7 @@ AC_SUBST([enable_vty_group]) enable_configfile_mask=${enable_configfile_mask:-0600} AC_DEFINE_UNQUOTED(CONFIGFILE_MASK, ${enable_configfile_mask}, Mask for config files) +AC_SUBST([enable_configfile_mask]) enable_logfile_mask=${enable_logfile_mask:-0600} AC_DEFINE_UNQUOTED(LOGFILE_MASK, ${enable_logfile_mask}, Mask for log files) diff --git a/tools/frr.in b/tools/frr.in index 77e032e558..2fde422a67 100755 --- a/tools/frr.in +++ b/tools/frr.in @@ -21,6 +21,7 @@ VTYSH="@vtysh_bin@" # /usr/bin/vtysh FRR_USER="@enable_user@" # frr FRR_GROUP="@enable_group@" # frr FRR_VTY_GROUP="@enable_vty_group@" # frrvty +FRR_CONFIG_MODE="@enable_configfile_mask@" # 0600 # Local Daemon selection may be done by using /etc/frr/daemons. # See /usr/share/doc/frr/README.Debian.gz for further information. @@ -56,6 +57,7 @@ chownfrr() { test -n "$FRR_USER" && chown "$FRR_USER" "$1" test -n "$FRR_GROUP" && chgrp "$FRR_GROUP" "$1" + test -n "$FRR_CONFIG_MODE" && chmod "$FRR_CONFIG_MODE" "$1" } # Check if daemon is started by using the pidfile. diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in index 897e6d6558..c986cd787c 100644 --- a/tools/frrcommon.sh.in +++ b/tools/frrcommon.sh.in @@ -24,6 +24,7 @@ VTYSH="@vtysh_bin@" # /usr/bin/vtysh FRR_USER="@enable_user@" # frr FRR_GROUP="@enable_group@" # frr FRR_VTY_GROUP="@enable_vty_group@" # frrvty +FRR_CONFIG_MODE="@enable_configfile_mask@" # 0600 # ORDER MATTERS FOR $DAEMONS! # - keep zebra first @@ -52,6 +53,7 @@ debug() { chownfrr() { [ -n "$FRR_USER" ] && chown "$FRR_USER" "$1" [ -n "$FRR_GROUP" ] && chgrp "$FRR_GROUP" "$1" + [ -n "$FRR_CONFIG_MODE" ] && chmod "$FRR_CONFIG_MODE" "$1" } vtysh_b () { |