diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2015-05-25 23:17:55 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2015-05-26 08:24:34 +0200 |
| commit | 1905bd6c7e1123adccfd24803fea67227228d38c (patch) | |
| tree | 4485963e814a2fd73495f7d4eb6121e695b4bf8c | |
| parent | f3d21897916d7da89fe5936993351504e9f0bfc6 (diff) | |
Substitute proper paths in ax25d.conf.
Depending on the prefix configured, the default ax25d.conf file may
contain incorrects paths. Generate config file using the correct
sbin dir.
Assume node which is not part of ax25-tools to be installed with the
same prefix. Don't probe - chances are the sysadmin of a node system
is going to install it after ax25-tools so we'd likely have to guess
which never is a good thing.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | ax25/.gitignore | 1 | ||||
| -rw-r--r-- | ax25/Makefile.am | 12 | ||||
| -rw-r--r-- | ax25/ax25d.conf | 14 | ||||
| -rw-r--r-- | ax25/ax25d.conf.in | 49 |
4 files changed, 69 insertions, 7 deletions
diff --git a/ax25/.gitignore b/ax25/.gitignore index a925695..e534e1e 100644 --- a/ax25/.gitignore +++ b/ax25/.gitignore @@ -3,6 +3,7 @@ Makefile Makefile.in ax25d +/ax25d.conf axctl axparms axspawn diff --git a/ax25/Makefile.am b/ax25/Makefile.am index 40eac38..b6bdbe5 100644 --- a/ax25/Makefile.am +++ b/ax25/Makefile.am @@ -1,8 +1,17 @@ SUBDIRS = axgetput etcfiles = ax25.profile ax25d.conf axspawn.conf rxecho.conf +etcsrcfiles = ax25.profile ax25d.conf.in axspawn.conf rxecho.conf +noinst_DATA = $(etcfiles) varfiles = mheard.dat +subst_path = sed -e 's|[@]SBINDIR[@]|$(sbindir)|' \ + -e 's|[@]SYSCONFDIR[@]|$(sysconfdir)|' + +ax25d.conf: ax25d.conf.in + $(subst_path) < $(srcdir)/ax25d.conf.in > ax25d.conf.tmp + mv ax25d.conf.tmp ax25d.conf + installconf: $(mkinstalldirs) $(DESTDIR)$(AX25_SYSCONFDIR) @list='$(etcfiles)'; for p in $$list; do \ @@ -36,7 +45,8 @@ dist_man_MANS = ax25.4 ax25d.conf.5 axspawn.conf.5 rxecho.conf.5 \ -EXTRA_DIST = $(etcfiles) $(varfiles) +CLEANFILES = ax25d.conf +EXTRA_DIST = $(etcsrcfiles) $(varfiles) ax25d_SOURCES = ax25d.c axctl_SOURCES = axctl.c diff --git a/ax25/ax25d.conf b/ax25/ax25d.conf index 36ec357..890a048 100644 --- a/ax25/ax25d.conf +++ b/ax25/ax25d.conf @@ -1,9 +1,11 @@ -# /etc/ax25/ax25d.conf +# /usr/local/etc/ax25/ax25d.conf # # ax25d Configuration File. # # AX.25 Ports begin with a '['. # +# Please note that the programs node and finger are not part of ax25-tools. +# [OH2BNS VIA 1] NOCALL * * * * * * L default * * * * * * - root /usr/local/sbin/ttylinkd ttylinkd @@ -12,7 +14,7 @@ default * * * * * * - root /usr/local/sbin/ttylinkd ttylinkd # [OH2BNS-2 VIA 1] NOCALL * * * * * * L -default * * * * * * - root /usr/sbin/node node +default * * * * * * - root /usr/local/sbin/node node # # [OH2BNS VIA 2] @@ -21,7 +23,7 @@ default * * * * * * - root /usr/local/sbin/ttylinkd ttylinkd # [OH2BNS-2 VIA 2] NOCALL * * * * * * L -default * * * * * * - root /usr/sbin/node node +default * * * * * * - root /usr/local/sbin/node node # [OH2BNS-3 VIA 2] NOCALL * * * * * * L @@ -29,7 +31,7 @@ default * * * * * * - root /usr/local/sbin/axwrapper axwrapper /usr/bin/finge # #[OH2BNS-9] #NOCALL * * * * * * L -#default * * * * * * - root /usr/sbin/node node +#default * * * * * * - root /usr/local/sbin/node node # # NET/ROM Ports begin with a '<'. # @@ -39,9 +41,9 @@ default * * * * * * - root /usr/local/sbin/axwrapper axwrapper /usr/bin/finge # <netrom> NOCALL * * * * * * L -default * * * * * * - root /usr/sbin/node node +default * * * * * * - root /usr/local/sbin/node node # #<netrom> #NOCALL * * * * * * L -#default * * * * * * - root /usr/sbin/node node +#default * * * * * * - root /usr/local/sbin/node node # diff --git a/ax25/ax25d.conf.in b/ax25/ax25d.conf.in new file mode 100644 index 0000000..13b1a0f --- /dev/null +++ b/ax25/ax25d.conf.in @@ -0,0 +1,49 @@ +# @SYSCONFDIR@/ax25/ax25d.conf +# +# ax25d Configuration File. +# +# AX.25 Ports begin with a '['. +# +# Please note that the programs node and finger are not part of ax25-tools. +# +[OH2BNS VIA 1] +NOCALL * * * * * * L +default * * * * * * - root @SBINDIR@/ttylinkd ttylinkd +#parameters_extAX25 VC-wait-login VC-disc-on-linkfailure-msg VC-log-connections +# +# +[OH2BNS-2 VIA 1] +NOCALL * * * * * * L +default * * * * * * - root @SBINDIR@ node +# +# +[OH2BNS VIA 2] +NOCALL * * * * * * L +default * * * * * * - root @SBINDIR@/ttylinkd ttylinkd +# +[OH2BNS-2 VIA 2] +NOCALL * * * * * * L +default * * * * * * - root @SBINDIR@ node +# +[OH2BNS-3 VIA 2] +NOCALL * * * * * * L +default * * * * * * - root @SBINDIR@/axwrapper axwrapper /usr/bin/finger finger +# +#[OH2BNS-9] +#NOCALL * * * * * * L +#default * * * * * * - root @SBINDIR@ node +# +# NET/ROM Ports begin with a '<'. +# +#<netrom> +#NOCALL * * * * * * L +#default * * * * * * - root @SBINDIR@/ttylinkd ttylinkd +# +<netrom> +NOCALL * * * * * * L +default * * * * * * - root @SBINDIR@ node +# +#<netrom> +#NOCALL * * * * * * L +#default * * * * * * - root @SBINDIR@ node +# |