From ff62df2e4484b9f89fea4ed736006c21f3a797cc Mon Sep 17 00:00:00 2001
From: David Lamparter <equinox@opensourcerouting.org>
Date: Wed, 24 Jan 2024 19:32:10 +0100
Subject: build: untangle sysconfdir & localstatedir

`--sysconfdir` should be `/etc` and `--localstatedir` should be `/var`.
The package-specific subdirectory should be added by configure, not
given by the user, to match established behavior by other packages.

Note that `--bindir`, `--sbindir`, `--libdir` and `--libexecdir` have
different established/expected behavior due to distro specific
multi-arch support.  That's why these are left unchanged.

The reason this is getting fixed now is that we need to use
`--localstatedir` for its actual value to put things in `/var/lib`.  As
it is now, being overloaded for `/run`, the configured `/var` path
becomes inaccessible.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---
 pkgsrc/bgpd.sh.in   | 2 +-
 pkgsrc/eigrpd.sh.in | 2 +-
 pkgsrc/mgmtd.sh.in  | 2 +-
 pkgsrc/ospf6d.sh.in | 2 +-
 pkgsrc/ospfd.sh.in  | 2 +-
 pkgsrc/ripd.sh.in   | 2 +-
 pkgsrc/ripngd.sh.in | 2 +-
 pkgsrc/zebra.sh.in  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'pkgsrc')

diff --git a/pkgsrc/bgpd.sh.in b/pkgsrc/bgpd.sh.in
index d234b5435c..bd6aba4f10 100644
--- a/pkgsrc/bgpd.sh.in
+++ b/pkgsrc/bgpd.sh.in
@@ -16,7 +16,7 @@ fi
 
 name="bgpd"
 rcvar=$name
-required_files="@sysconfdir@/${name}.conf"
+required_files="@CFG_SYSCONF@/${name}.conf"
 command="@prefix@/sbin/${name}"
 command_args="-d"
 
diff --git a/pkgsrc/eigrpd.sh.in b/pkgsrc/eigrpd.sh.in
index b28b81eeda..e6b6b3c218 100644
--- a/pkgsrc/eigrpd.sh.in
+++ b/pkgsrc/eigrpd.sh.in
@@ -16,7 +16,7 @@ fi
 
 name="eigrpd"
 rcvar=$name
-required_files="@sysconfdir@/${name}.conf"
+required_files="@CFG_SYSCONF@/${name}.conf"
 command="@prefix@/sbin/${name}"
 command_args="-d"
 
diff --git a/pkgsrc/mgmtd.sh.in b/pkgsrc/mgmtd.sh.in
index fb57c0a2fb..91a45f2e9e 100644
--- a/pkgsrc/mgmtd.sh.in
+++ b/pkgsrc/mgmtd.sh.in
@@ -16,7 +16,7 @@ fi
 
 name="mgmtd"
 rcvar=$name
-required_files="@sysconfdir@/${name}.conf"
+required_files="@CFG_SYSCONF@/${name}.conf"
 command="@prefix@/sbin/${name}"
 command_args="-d"
 
diff --git a/pkgsrc/ospf6d.sh.in b/pkgsrc/ospf6d.sh.in
index 3fbdb81b7f..bdd348ee7a 100644
--- a/pkgsrc/ospf6d.sh.in
+++ b/pkgsrc/ospf6d.sh.in
@@ -16,7 +16,7 @@ fi
 
 name="ospf6d"
 rcvar=$name
-required_files="@sysconfdir@/${name}.conf"
+required_files="@CFG_SYSCONF@/${name}.conf"
 command="@prefix@/sbin/${name}"
 command_args="-d"
 
diff --git a/pkgsrc/ospfd.sh.in b/pkgsrc/ospfd.sh.in
index daa2252091..508b8af47d 100644
--- a/pkgsrc/ospfd.sh.in
+++ b/pkgsrc/ospfd.sh.in
@@ -16,7 +16,7 @@ fi
 
 name="ospfd"
 rcvar=$name
-required_files="@sysconfdir@/${name}.conf"
+required_files="@CFG_SYSCONF@/${name}.conf"
 command="@prefix@/sbin/${name}"
 command_args="-d"
 
diff --git a/pkgsrc/ripd.sh.in b/pkgsrc/ripd.sh.in
index 31575419fc..ca915ad9d2 100644
--- a/pkgsrc/ripd.sh.in
+++ b/pkgsrc/ripd.sh.in
@@ -16,7 +16,7 @@ fi
 
 name="ripd"
 rcvar=$name
-required_files="@sysconfdir@/${name}.conf"
+required_files="@CFG_SYSCONF@/${name}.conf"
 command="@prefix@/sbin/${name}"
 command_args="-d"
 
diff --git a/pkgsrc/ripngd.sh.in b/pkgsrc/ripngd.sh.in
index d06ac90b02..18d6cd4d30 100644
--- a/pkgsrc/ripngd.sh.in
+++ b/pkgsrc/ripngd.sh.in
@@ -16,7 +16,7 @@ fi
 
 name="ripngd"
 rcvar=$name
-required_files="@sysconfdir@/${name}.conf"
+required_files="@CFG_SYSCONF@/${name}.conf"
 command="@prefix@/sbin/${name}"
 command_args="-d"
 
diff --git a/pkgsrc/zebra.sh.in b/pkgsrc/zebra.sh.in
index c2f12a7833..dc5016cd18 100644
--- a/pkgsrc/zebra.sh.in
+++ b/pkgsrc/zebra.sh.in
@@ -16,7 +16,7 @@ fi
 
 name="zebra"
 rcvar=$name
-required_files="@sysconfdir@/${name}.conf"
+required_files="@CFG_SYSCONF@/${name}.conf"
 command="@prefix@/sbin/${name}"
 command_args="-d"
 
-- 
cgit v1.2.3