From dc98f74efcffc8bb0f40fc265e101d193fe0fd88 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 21 Apr 2015 12:23:14 +0200
Subject: [PATCH] contrib/bkr: make configuration options for logging.level and
 main.dhcp configurable

$ ./brk.py -V "CONF_LOGLEVEL=INFO -V CONF_DHCP=internal
---
 contrib/rh-bkr/bkr.py    | 3 +++
 contrib/rh-bkr/job01.xml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/rh-bkr/bkr.py b/contrib/rh-bkr/bkr.py
index 7ae3ffde27..6adb47da82 100755
--- a/contrib/rh-bkr/bkr.py
+++ b/contrib/rh-bkr/bkr.py
@@ -663,6 +663,9 @@ class CmdSubmit(CmdBase):
             'UUID'              : str(uuid.uuid4()),
             'RESERVESYS'        : _process_line_get_RESERVESYS,
             'SELINUX_DISABLED'  : _process_line_get_SELINUX_DISABLED,
+            'CONF_LOGLEVEL'     : 'DEBUG',
+            'CONF_DHCP'         : 'dhclient',
+            'CONF_DEBUG'        : 'RLIMIT_CORE,fatal-warnings',
         }
     def _process_line_get(self, key, replacement, index=None, none=None):
         if key in replacement:
diff --git a/contrib/rh-bkr/job01.xml b/contrib/rh-bkr/job01.xml
index 078165bb10..db6a53659e 100644
--- a/contrib/rh-bkr/job01.xml
+++ b/contrib/rh-bkr/job01.xml
@@ -53,7 +53,7 @@
 			</task>
 			<task name="/distribution/command" role="STANDALONE">
 				<params>
-					<param name="CMDS_TO_RUN" value="sed -i '$$s/$$/\n[logging]\n    level=DEBUG\n    domains=ALL\n\n[main]\n    debug=RLIMIT_CORE\n/' /etc/NetworkManager/NetworkManager.conf"/>
+					<param name="CMDS_TO_RUN" value="mkdir -p /etc/NetworkManager/conf.d/; printf '[main]\n    debug=$CONF_DEBUG\n    dhcp=$CONF_DHCP\n\n[logging]\n    level=$CONF_LOGLEVEL\n    domains=ALL\n\n' > /etc/NetworkManager/conf.d/99-test.conf"/>
 				</params>
 			</task>
 			<task name="/distribution/command" role="STANDALONE">