spacewalk/setup/bin/spacewalk-setup | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
New commits: commit da2c0c4e9159acfb8eed145e1d56d511c6037755 Author: Jan Pazdziora jpazdziora@redhat.com Date: Fri Mar 22 10:09:43 2013 +0100
Use multiparameter system to better predictability.
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index f27b5f7..80e31a6 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -255,7 +255,7 @@ sub setup_cobbler { # Cobbler 2.0 can use the old helper script system(COBBLER_20_COMMAND); } else { - system(COBBLER_COMMAND . " --verbose --macros hostname:$answers->{'hostname'}"); + system(COBBLER_COMMAND, '--verbose', '--macros', "hostname:$answers->{'hostname'}");
my $skip_rhnconf = 0; open(FILE, "<" . Spacewalk::Setup::DEFAULT_RHN_CONF_LOCATION);
commit f3e1c95c7d47778d577daec14f087cbda64c36bf Author: Jan Pazdziora jpazdziora@redhat.com Date: Fri Mar 22 10:08:24 2013 +0100
We do not want to run cobbler sync when cobblerd is not running.
Addressing cobblerd does not appear to be running/accessible
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup index 685559b..f27b5f7 100755 --- a/spacewalk/setup/bin/spacewalk-setup +++ b/spacewalk/setup/bin/spacewalk-setup @@ -273,7 +273,6 @@ sub setup_cobbler { print FILE "cobbler.host = " . $answers->{'hostname'} . "\n"; close(FILE); } - system("/usr/bin/cobbler sync"); }
Spacewalk::Setup::ask( @@ -296,8 +295,6 @@ sub setup_cobbler { system("chkconfig xinetd on"); } } - - system("cobbler sync"); }
sub setup_admin_email {
spacewalk-commits@lists.fedorahosted.org