From e3eff1464f5be5bcf83637101b2d2028d65cf576 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Wed, 10 Nov 2010 12:58:50 +0000
Subject: apply patch from blino to use config file from /etc/iurt

---
 iurt2 | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'iurt2')

diff --git a/iurt2 b/iurt2
index 709bdc1..e207cb3 100755
--- a/iurt2
+++ b/iurt2
@@ -388,14 +388,16 @@ my $real_arch = `uname -m`;
 chomp $real_arch;
 my $HOME = $ENV{HOME};
 my $configfile = "$HOME/.iurt.$run{distro_tag}.conf";
-
-plog('DEBUG', "load config: $configfile");
-my $config;
-if (-f $configfile) {
-    $config = eval(cat_($configfile))
-	or die "FATAL $program_name: syntax error in $configfile";
-} else {
-    $config = {};
+my $sysconfigfile = "/etc/iurt/$run{distro_tag}.conf";
+
+my $config = {};
+foreach my $f ($configfile, $sysconfigfile) {
+    plog('DEBUG', "load config: $f");
+    if (-f $f) {
+        $config = eval(cat_($f))
+          or die "FATAL $program_name: syntax error in $f";
+        last;
+    }
 }
 
 if ($run{repository}) {
-- 
cgit v1.2.1