spacewalk/setup/bin/spacewalk-setup | 10 +++++-----
spacewalk/setup/lib/Spacewalk/Setup.pm | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit d13dfec89347525c27df64f9f92196cadb68d878
Author: Devan Goodwin <dgoodwin(a)redhat.com>
Date: Thu Jul 30 11:33:27 2009 -0300
More spacewalk-setup SHARED_DIR fixes.
Was still broken, adjusting all references.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index d0fd548..ff5ae52 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 . "/setup/old-jvm-list";
+ my $jvm_list = Spacewalk::Setup::SHARED_DIR . "/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 . '/setup/sudoers.base';
+ my $init_sudoers_path = Spacewalk::Setup::SHARED_DIR . '/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 . '/setup/sudoers.clear') {
+ if (open FILE, Spacewalk::Setup::SHARED_DIR . '/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 . '/setup/sudoers.[0-9]') {
+ for my $file (glob Spacewalk::Setup::SHARED_DIR . '/sudoers.[0-9]') {
open FILE, $file or die "Error reading [$file]: $!\n";
my $regexp = <FILE>;
chomp $regexp;
@@ -472,7 +472,7 @@ sub setup_ssl_vhost {
exit;
}
- for my $file (glob Spacewalk::Setup::SHARED_DIR . '/setup/ssl.conf.[0-9]') {
+ for my $file (glob Spacewalk::Setup::SHARED_DIR . '/ssl.conf.[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 510a47e..08601d0 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -34,13 +34,13 @@ our $VERSION = '0.6';
use constant SATELLITE_SYSCONFIG => "/etc/sysconfig/rhn-satellite";
-use constant SHARED_DIR => "/usr/share/spacewalk";
+use constant SHARED_DIR => "/usr/share/spacewalk/setup";
use constant POSTGRESQL_SCHEMA_FILE => File::Spec->catfile("/etc",
"sysconfig",
'rhn', 'postgres', 'main.sql');
use constant DEFAULT_ANSWER_FILE_GLOB =>
- SHARED_DIR . '/setup/defaults.d/*.conf';
+ SHARED_DIR . '/defaults.d/*.conf';
use constant DEFAULT_RHN_CONF_LOCATION =>
'/etc/rhn/rhn.conf';
@@ -940,7 +940,7 @@ EOQ
if (not $opts->{"skip-db-diskspace-check"}) {
system_or_exit(['python', SHARED_DIR .
- '/setup/embedded_diskspace_check.py'], 14,
+ '/embedded_diskspace_check.py'], 14,
'There is not enough space available for the embedded database.');
}
else {
Show replies by date