spacewalk/setup/lib/Spacewalk/Setup.pm | 38 ++++++++++++++++-----------------
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 49f77a44b088c3882f1b72521319e8fc5239cb30
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Sep 20 13:29:28 2010 +0200
use bind variables
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm
b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 799c162..cc1121b 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -1534,43 +1534,43 @@ sub update_monitoring_scout {
my $dbh = get_dbh($answers);
# If IP address for satellite / spacewalk scout was set to 127.0.0.1, it needs to be
updated
- my $sql1 = qq/
+ my $sql1 = q{
update rhn_sat_node
- set ip = '$ip_addr',
+ set ip = ?,
last_update_user = 'upgrade',
last_update_date = sysdate
where ip = '127.0.0.1' and
- recid = 2/;
+ recid = 2};
- my $sql2 = qq/
+ my $sql2 = q{
update rhn_sat_cluster
- set vip = '$ip_addr',
+ set vip = ?,
last_update_user = 'upgrade',
last_update_date = sysdate
where vip = '127.0.0.1' and
- recid = 1/;
+ recid = 1};
# If IP address for satellite / spacewalk scout was not set, it needs to be updated
- my $sql3 = qq/
+ my $sql3 = q{
update rhn_sat_node
- set ip = '$ip_addr',
+ set ip = ?,
last_update_user = 'upgrade',
last_update_date = sysdate
where ip is null and
- recid = 2/;
+ recid = 2};
- my $sql4 = qq/
+ my $sql4 = q{
update rhn_sat_cluster
- set vip = '$ip_addr',
+ set vip = ?,
last_update_user = 'upgrade',
last_update_date = sysdate
where vip is null and
- recid = 1/;
+ recid = 1};
- $dbh->do($sql1);
- $dbh->do($sql2);
- $dbh->do($sql3);
- $dbh->do($sql4);
+ $dbh->do($sql1, {}, ($ip_addr));
+ $dbh->do($sql2, {}, ($ip_addr));
+ $dbh->do($sql3, {}, ($ip_addr));
+ $dbh->do($sql4, {}, ($ip_addr));
$dbh->commit;
$dbh->disconnect;
commit b2d97d5b99158cb650da487add79a316d1b94816
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Sep 20 12:21:27 2010 +0200
don't use RHN::Utils in spacewalk-setup
We don't want to be including RHN::Utils on the Satellite iso
(for install.pl to work correctly).
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm
b/spacewalk/setup/lib/Spacewalk/Setup.pm
index d071383..799c162 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -16,12 +16,11 @@ use IPC::Open3 qw(open3);
use Pod::Usage qw(pod2usage);
use POSIX ":sys_wait_h";
use Fcntl qw(F_GETFD F_SETFD FD_CLOEXEC);
+use Socket;
use Params::Validate qw(validate);
Params::Validate::validation_options(strip_leading => "-");
-use RHN::Utils;
-
=head1 NAME
Spacewalk::Setup, spacewalk-setup
@@ -1529,7 +1528,8 @@ sub update_monitoring_scout {
return unless ($opts->{'upgrade'});
- my $ip_addr = RHN::Utils::find_ip_address($answers->{'hostname'});
+ my $host = gethostbyname($answers->{'hostname'});
+ my $ip_addr = inet_ntoa($host);
my $dbh = get_dbh($answers);
Show replies by date