On Tue, Jul 14, 2009 at 5:51 PM, Partha Aji<par...@fedoraproject.org> wrote: > spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf | 3 +++ > spacewalk/config/satellite-rules.conf | 4 > +++- > spacewalk/setup/bin/spacewalk-setup | 1 + > spacewalk/setup/share/upgrade/rhn-load-config.pl | 6 > ++---- > 4 files changed, 9 insertions(+), 5 deletions(-) > > New commits: > commit 9a04a11541e09092ee74322ab9b2a480ba6c8056 > Author: Partha Aji <p...@redhat.com> > Date: Tue Jul 14 17:54:12 2009 -0400 > > 511100 - Fixed upgrade scripts to include cobbler.host > > diff --git > a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf > b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf > index b7a2e16..1eed807 100644 > --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf > +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf > @@ -88,3 +88,6 @@ web.force_unentitlement=0 > > # system snapshots enabled > enable_snapshots = 1 > + > +#cobbler host name > +cobbler.host = @@cobblerDOThost@@ > diff --git a/spacewalk/config/satellite-rules.conf > b/spacewalk/config/satellite-rules.conf > index e68ccc7..dea21ff 100644 > --- a/spacewalk/config/satellite-rules.conf > +++ b/spacewalk/config/satellite-rules.conf > @@ -101,4 +101,6 @@ webDOTis_monitoring_scout= > # line 45 > serverDOTnls_lang[prompt]=Enter a value for serverDOTnls_lang > serverDOTnls_lang=english.UTF8 > - > +#line 46 > +cobblerDOThost[prompt]=Enter a value for cobblerDOThost > +cobblerDOThost= > diff --git a/spacewalk/setup/bin/spacewalk-setup > b/spacewalk/setup/bin/spacewalk-setup > index 7285b45..7a00825 100755 > --- a/spacewalk/setup/bin/spacewalk-setup > +++ b/spacewalk/setup/bin/spacewalk-setup > @@ -983,6 +983,7 @@ sub populate_initial_configs { > monitoringDOTorahome => '/opt/oracle', > monitoringDOTdbd => 'Oracle', > monitoringDOTscout_shared_key => '', # blank for now. > + cobblerDOThost => $answers->{hostname} > ); > > for ($config_opts{'db_password'}) { > diff --git a/spacewalk/setup/share/upgrade/rhn-load-config.pl > b/spacewalk/setup/share/upgrade/rhn-load-config.pl > old mode 100644 > new mode 100755 > index 2d2535f..5ea4fb6 > --- a/spacewalk/setup/share/upgrade/rhn-load-config.pl > +++ b/spacewalk/setup/share/upgrade/rhn-load-config.pl > @@ -115,16 +115,14 @@ if ($already_monitoring) { > > my %nls_database_paramaters = RHN::SatInstall->get_nls_database_parameters(); > $config_opts{serverDOTnls_lang} = 'english.' . > $nls_database_paramaters{NLS_CHARACTERSET}; > - > +$config_opts{cobblerDOThost} = Sys::Hostname::hostname; > print "Writing configuration\n"; > - > - > RHN::SatInstall->write_config(\%config_opts, > > '/etc/sysconfig/rhn-satellite-prep/satellite-local-rules.conf'); > > > Spacewalk::Setup::satcon_deploy(); > - > +s > print "Done\n";
Um what is that 's' doing in the script? PLEASE be more careful with your commits. jesus _______________________________________________ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel