spacewalk/setup/bin/spacewalk-setup | 2 +-
spacewalk/setup/lib/Spacewalk/Setup.pm | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit a95b50dbdb294504d9ea54038497ab7d59f4e17d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 26 17:00:19 2011 +0100
Make all system_debug invocations multiparameter.
Addressing
avc: denied { read } for pid=4769 comm="consoletype"
path="/var/log/rhn/rhn-installation.log" dev=dm-0 ino=1578084
scontext=unconfined_u:system_r:consoletype_t:s0
tcontext=system_u:object_r:spacewalk_install_log_t:s0 tclass=file
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index bc56bdc..c0c208e 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -1301,7 +1301,7 @@ sub setup_gpg {
Spacewalk::Setup::system_or_exit(['mkdir', '-m', '700',
'/root/.gnupg'], 12, 'Could not create /root/.gnupg');
}
- Spacewalk::Setup::system_or_exit(['/usr/bin/gpg --list-keys'], 12, 'Could
not run gpg.');
+ Spacewalk::Setup::system_or_exit(['/usr/bin/gpg', '--list-keys'], 12,
'Could not run gpg.');
my $key_path = '/usr/share/rhn/RHN-GPG-KEY';
if ( ! (-e $key_path) ) {
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm
b/spacewalk/setup/lib/Spacewalk/Setup.pm
index bfa14a9..efffba2 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -210,10 +210,7 @@ sub system_debug {
else {
local $SIG{'ALRM'};
if (@args == 1) {
- set_spinning_callback();
- my $ret = system("$args[0] 1>> $logfile 2>&1");
- alarm 0;
- return $ret;
+ die "Single parameter system_debug [@args] not supported.\n";
} else {
local *LOGFILE;
open(LOGFILE, ">>", $logfile) or do {
@@ -433,7 +430,7 @@ sub clear_db {
print loc("** Database: Shutting down spacewalk services that may be using
DB.\n");
- system_debug('/usr/sbin/spacewalk-service --exclude=oracle* --exclude=postgresql
stop');
+ system_debug('/usr/sbin/spacewalk-service', '--exclude=oracle*',
'--exclude=postgresql', 'stop');
print loc("** Database: Services stopped. Clearing DB.\n");
Show replies by date