From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 9 May 2022 16:17:14 +0000 (+0000)
Subject: pakfire: Allow passing a specific configuration file
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c45f9c6c09ec5a23dd029bd57dd3c485ccc8b5d3;p=people%2Fms%2Fbricklayer.git

pakfire: Allow passing a specific configuration file

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

diff --git a/src/bricklayer b/src/bricklayer
index b0d3a4c..c3727df 100644
--- a/src/bricklayer
+++ b/src/bricklayer
@@ -40,6 +40,8 @@ class Cli(object):
 		parser = argparse.ArgumentParser(
 			description=_("IPFire Installation Tool CLI"),
 		)
+		parser.add_argument("--pakfire-conf", metavar=_("FILE"),
+			help=_("Pakfire Configuration file used for the installation process"))
 		parser.add_argument("--first-install", action="store_true",
 			help=_("Runs the \"first install\" setup process"))
 		parser.add_argument("--arch", nargs="?", default=self.native_arch,
diff --git a/src/python/__init__.py b/src/python/__init__.py
index db3741d..2dcceb2 100644
--- a/src/python/__init__.py
+++ b/src/python/__init__.py
@@ -45,8 +45,10 @@ class Bricklayer(object):
 	"""
 		Bricklayer's base class
 	"""
-	def __init__(self, arch, first_install=False, debug=False, unattended=False, disks=[]):
+	def __init__(self, arch, pakfire_conf=None, first_install=False, debug=False,
+			unattended=False, disks=[]):
 		self.arch = arch
+		self.pakfire_conf = pakfire_conf
 		self.first_install = first_install
 		self.debug = debug
 		self.unattended = unattended
@@ -246,7 +248,7 @@ class Bricklayer(object):
 		}
 
 		return pakfire.Pakfire(self.root, arch=self.arch,
-			conf="/etc/pakfire/distros/ipfire3.conf", **kwargs)
+			conf=self.pakfire_conf, **kwargs)
 
 	def _select_bootloaders(self):
 		"""