rel-eng/packages/spacewalk-setup | 2 +-
satellite/install/install.pl | 4 +++-
spacewalk/setup/bin/spacewalk-setup | 2 +-
spacewalk/setup/lib/Spacewalk/Setup.pm | 5 ++++-
spacewalk/setup/spacewalk-setup.spec | 5 ++++-
5 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 85e4aa656330ea185a7def7dc46be8a2f7b1755f
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 21 12:20:51 2013 +0200
Automatic commit of package [spacewalk-setup] release [1.10.15-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index d7f4169..5e81943 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.10.14-1 spacewalk/setup/
+1.10.15-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 65bd628..9b6ce71 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup
-Version: 1.10.14
+Version: 1.10.15
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Fri Jun 21 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.15-1
+- Don't use embedded db default settings for a managed db setup
+
* Mon Jun 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.14-1
- removed old CVS/SVN version ids
commit 7b778260c7b2fadf69dd5d3f805c77038c4f9ab6
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Jun 21 12:19:26 2013 +0200
Don't use embedded db default settings for a managed db setup
diff --git a/satellite/install/install.pl b/satellite/install/install.pl
index a316e01..5aae338 100755
--- a/satellite/install/install.pl
+++ b/satellite/install/install.pl
@@ -54,7 +54,9 @@ if (-e Spacewalk::Setup::DEFAULT_RHN_CONF_LOCATION) {
}
my %answers = ();
-Spacewalk::Setup::load_answer_file(\%opts, \%answers);
+my @skip = ();
+push @skip, Spacewalk::Setup::EMBEDDED_DB_ANSWERS if (defined
$opts{'managed-db'});
+Spacewalk::Setup::load_answer_file(\%opts, \%answers, \@skip);
$answers{hostname} ||= Sys::Hostname::hostname;
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 8d55cfb..eac3773 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -44,7 +44,7 @@ use constant COBBLER_COMMAND => 'spacewalk-setup-cobbler';
my %opts = Spacewalk::Setup::parse_options();
my %answers = ();
-Spacewalk::Setup::load_answer_file(\%opts, \%answers);
+Spacewalk::Setup::load_answer_file(\%opts, \%answers, []);
my $product_name = $answers{'product_name'} || 'Spacewalk';
$answers{hostname} ||= Sys::Hostname::hostname;
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm
b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 654e20d..b91b608 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -91,6 +91,8 @@ use constant DB_MIGRATION_LOG_FILE =>
use constant ORACLE_RHNCONF_BACKUP =>
'/tmp/oracle-rhn.conf';
+use constant EMBEDDED_DB_ANSWERS =>
+ '/usr/share/spacewalk/setup/defaults.d/embedded-postgresql.conf';
my $DEBUG;
@@ -181,8 +183,9 @@ sub read_config {
sub load_answer_file {
my $options = shift;
my $answers = shift;
+ my (@skip) = @{(shift)};
- my @files = glob(DEFAULT_ANSWER_FILE_GLOB);
+ my @files = map {$_ if (not grep($_, @skip))} glob(DEFAULT_ANSWER_FILE_GLOB);
push @files, $options->{'answer-file'} if
$options->{'answer-file'};
for my $file (@files) {
Show replies by date