spacewalk/setup/bin/spacewalk-setup | 8 ++++----
spacewalk/setup/lib/Spacewalk/Setup.pm | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 079021621c3b6b2cc653b13c6dfa7729d590f740
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Thu Jul 30 11:16:41 2009 -0300
Fix spacewalk-setup SHARED_DIR problems from pgsql merge.
Some of the path changes were lost, possibly during merges, resulting in
incorrect sudo'ers setup during installation. (would only affect webui
restarts)
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 9fc9ce3..d0fd548 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -195,7 +195,7 @@ sub remove_old_jvm {
return unless (($opts{"upgrade"}) and ($product_name =~ /Satellite/));
- my $jvm_list = Spacewalk::Setup::SHARED_DIR . "/old-jvm-list";
+ my $jvm_list = Spacewalk::Setup::SHARED_DIR . "/setup/old-jvm-list";
local *F;
open F, $jvm_list or die "Error opening [$jvm_list]: $!\n";
@@ -288,7 +288,7 @@ sub setup_sudoers {
open FILE, $sudoers_path or die "Error reading [$sudoers_path]: $!\n";
} else {
# otherwise start with our own file
- my $init_sudoers_path = Spacewalk::Setup::SHARED_DIR . '/sudoers.base';
+ my $init_sudoers_path = Spacewalk::Setup::SHARED_DIR . '/setup/sudoers.base';
open FILE, $init_sudoers_path
or die "Error reading [$init_sudoers_path]: $!\n";
$sudoers_content_orig = '';
@@ -302,7 +302,7 @@ sub setup_sudoers {
# The sudoers.clear file has regular expressions for clearing
# old configuration
- if (open FILE, Spacewalk::Setup::SHARED_DIR . '/sudoers.clear') {
+ if (open FILE, Spacewalk::Setup::SHARED_DIR . '/setup/sudoers.clear') {
while (defined(my $regexp = <FILE>)) {
chomp $regexp;
$sudoers_content =~ s!$regexp!!igm;
@@ -314,7 +314,7 @@ sub setup_sudoers {
# need to add to sudoers. The first line of each file helps us
# detect that the part is already present, and potentially
# modify it to the latest versions we need.
- for my $file (glob Spacewalk::Setup::SHARED_DIR . '/sudoers.[0-9]') {
+ for my $file (glob Spacewalk::Setup::SHARED_DIR . '/setup/sudoers.[0-9]') {
open FILE, $file or die "Error reading [$file]: $!\n";
my $regexp = <FILE>;
chomp $regexp;
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm
b/spacewalk/setup/lib/Spacewalk/Setup.pm
index b03dd55..510a47e 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -940,7 +940,7 @@ EOQ
if (not $opts->{"skip-db-diskspace-check"}) {
system_or_exit(['python', SHARED_DIR .
- '/embedded_diskspace_check.py'], 14,
+ '/setup/embedded_diskspace_check.py'], 14,
'There is not enough space available for the embedded database.');
}
else {
Show replies by date