From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 14 Jun 2021 15:12:39 +0000 (+0000)
Subject: pakfire-daemon: Replace default path to configuration file
X-Git-Tag: 0.9.28~1250
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94217cf290dbf7bf71857878f6dcb869f27ab563;p=pakfire.git

pakfire-daemon: Replace default path to configuration file

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index 531ff54b6..a586f985a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -602,7 +602,8 @@ substitutions = \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|bindir=$(bindir)|' \
-       '|libexecdir=$(libexecdir)|'
+       '|libexecdir=$(libexecdir)|' \
+       '|sysconfdir=$(sysconfdir)|'
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
diff --git a/src/scripts/pakfire-daemon.in b/src/scripts/pakfire-daemon.in
index 7a5904c07..a4ebc7e62 100644
--- a/src/scripts/pakfire-daemon.in
+++ b/src/scripts/pakfire-daemon.in
@@ -32,7 +32,8 @@ class Cli(object):
 		)
 
 		parser.add_argument("--config", "-c", nargs="?",
-			default="@sysconfdir@/daemon.conf", help=_("Configuration file to load"))
+			default="@sysconfdir@/pakfire/daemon.conf",
+			help=_("Configuration file to load"))
 
 		return parser.parse_args()