satellite/install/install.pl | 8 +++++--- spacewalk/setup/lib/Spacewalk/Setup.pm | 4 ++-- web/modules/dobby/Dobby/CLI/BackupCommands.pm | 12 ++++++------ web/modules/dobby/Dobby/CLI/MaintCommands.pm | 6 +++--- web/modules/dobby/Dobby/CLI/MiscCommands.pm | 4 ++-- 5 files changed, 18 insertions(+), 16 deletions(-)
New commits: commit a90ce0e8d25d29e5ba1f433dbf9d0d618bb5c175 Author: Miroslav Suchý msuchy@redhat.com Date: Mon Oct 22 16:08:41 2012 +0200
805822 - reword --help page
diff --git a/web/modules/dobby/Dobby/CLI/BackupCommands.pm b/web/modules/dobby/Dobby/CLI/BackupCommands.pm index 87f2870..2e6c145 100644 --- a/web/modules/dobby/Dobby/CLI/BackupCommands.pm +++ b/web/modules/dobby/Dobby/CLI/BackupCommands.pm @@ -35,22 +35,22 @@ sub register_dobby_commands { my $cli = shift;
$cli->register_mode(-command => "backup", - -description => "Backup the RHN Oracle Instance", + -description => "Backup the database instance of RHN Satellite", -handler => &command_backup); $cli->register_mode(-command => "restore", - -description => "Restore the RHN Oracle Instance from backup", + -description => "Restore the database instance of RHN Satellite from backup", -handler => &command_restore); $cli->register_mode(-command => "verify", - -description => "Verify an RHN Oracle Instance backup", + -description => "Verify an database instance of RHN Satellite backup", -handler => &command_restore); $cli->register_mode(-command => "examine", - -description => "Display information about an RHN Oracle Instance backup", + -description => "Display information about a database instance of RHN Satellite backup", -handler => &command_restore); $cli->register_mode(-command => "pg-online-backup", - -description => "Perform online backup the RHN PostgreSQL database", + -description => "Perform online backup the PostgreSQL of RHN Satellite database", -handler => &command_pg_online_backup); $cli->register_mode(-command => "pg-restore", - -description => "Restore the RHN PostgreSQL database made by pg-online-backup", + -description => "Restore the PostgreSQL database of RHN Satellite made by pg-online-backup", -handler => &command_pg_restore);
} diff --git a/web/modules/dobby/Dobby/CLI/MaintCommands.pm b/web/modules/dobby/Dobby/CLI/MaintCommands.pm index ef0c004..c5d7fb5 100644 --- a/web/modules/dobby/Dobby/CLI/MaintCommands.pm +++ b/web/modules/dobby/Dobby/CLI/MaintCommands.pm @@ -28,13 +28,13 @@ sub register_dobby_commands { my $cli = shift;
$cli->register_mode(-command => "extend", - -description => "Increase the RHN Oracle Instance tablespace (Oracle only)", + -description => "Increase the Oracle Instance tablespace of RHN Satellite (Oracle only)", -handler => &command_extend); $cli->register_mode(-command => "gather-stats", - -description => "Gather statistics on RHN Oracle database objects", + -description => "Gather statistics on database instance of RHN Satellite objects", -handler => &gather_stats); $cli->register_mode(-command => "shrink-segments", - -description => "Shrink RHN Oracle database segments (Oracle only)", + -description => "Shrink Oracle database segments of RHN Satellite (Oracle only)", -handler => &shrink_segments); }
diff --git a/web/modules/dobby/Dobby/CLI/MiscCommands.pm b/web/modules/dobby/Dobby/CLI/MiscCommands.pm index 1476110..29af33e 100644 --- a/web/modules/dobby/Dobby/CLI/MiscCommands.pm +++ b/web/modules/dobby/Dobby/CLI/MiscCommands.pm @@ -27,10 +27,10 @@ sub register_dobby_commands { my $cli = shift;
$cli->register_mode(-command => "stop", - -description => "Stop the RHN Oracle Instance", + -description => "Stop the database instance of RHN Satellite", -handler => &command_startstop); $cli->register_mode(-command => "start", - -description => "Start the RHN Oracle Instance", + -description => "Start the database instance of RHN Satellite", -handler => &command_startstop);
$cli->register_mode(-command => "status",
commit fdebe13109b35edaf729b3a2ba5d38e408d60fe8 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Oct 22 16:08:30 2012 +0200
made system_debug call multiparameter
diff --git a/satellite/install/install.pl b/satellite/install/install.pl index ac4ba8e..fdb01a8 100755 --- a/satellite/install/install.pl +++ b/satellite/install/install.pl @@ -274,7 +274,7 @@ sub python_path { }
sub system_is_registered { - my $ret = system_debug('/usr/sbin/rhn_check'); + my $ret = system_debug('/usr/sbin/rhn_check', '--');
return ($ret ? 0 : 1); }
commit 45e5e793fba0d550c7ca594f9fd6322c5b6323e4 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Oct 22 16:07:54 2012 +0200
support new ISO layout for Oracle and PostgreSQL
diff --git a/satellite/install/install.pl b/satellite/install/install.pl index afff022..ac4ba8e 100755 --- a/satellite/install/install.pl +++ b/satellite/install/install.pl @@ -104,7 +104,7 @@ install_rhn_packages(%opts);
my %satellite_rpms = map { m!^.+/(.+)-.+-.+$! and ( $1 => 1 ); } - glob("Satellite/*.rpm EmbeddedDB/*.rpm"); + glob("Satellite/*.rpm Oracle/*.rpm PostgreSQL/*.rpm"); my %current_rpm_qa = map { ( $_ => 1 ) } grep { not exists $rpm_qa{$_} and not exists $satellite_rpms{$_} } @@ -713,7 +713,9 @@ sub install_rhn_packages { my @rpms = glob("Satellite/*.rpm");
if (Spacewalk::Setup::is_embedded_db($opts)) { - push(@rpms, glob("EmbeddedDB/*.rpm")); + push(@rpms, glob("PostgreSQL/*.rpm")); + } else { + push(@rpms, glob("Oracle/*.rpm")); } system_or_exit(['yum', 'localinstall', '-y', @rpms], 26,
commit dc208cbcf480b194d5f66eae5b50128195b28a86 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Oct 22 16:07:45 2012 +0200
embedded database is now postgresql
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index 9dce806..b777e0d 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -204,11 +204,11 @@ sub load_answer_file { }
# Check if we're installing with an embedded database. Check for existence of -# an "EmbeddedDB" directory beneath the dir we're running from (i.e. +# an "PostgreSQL" directory beneath the dir we're running from (i.e. # installing from ISO) sub is_embedded_db { my $opts = shift; - return (-d 'EmbeddedDB' and not defined($opts->{'external-db'}) ? 1 : 0 ); + return (-d 'PostgreSQL' and not defined($opts->{'external-db'}) ? 1 : 0 ); }
sub system_debug {
spacewalk-commits@lists.fedorahosted.org