From 45e9ac6f1ebe8e6d5fb412c5bccbf822b6d9a7fb Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Tue, 19 Jun 2012 20:20:47 +0000 Subject: [PATCH] Actually source the httpmethod/httpport from site table git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13129 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/anaconda.pm | 2 ++ xCAT-server/lib/xcat/plugins/sles.pm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 5ad3e4f40..9d052cdad 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -111,6 +111,8 @@ sub process_request my $distname = undef; my $arch = undef; my $path = undef; + if ($::XCATSITEVALS{"httpmethod"}) { $httpmethod = $::XCATSITEVALS{"httpmethod"}; } + if ($::XCATSITEVALS{"httpport"}) { $httpport = $::XCATSITEVALS{"httpport"}; } if ($request->{command}->[0] eq 'copycd') { diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index 476823ae1..f0be135da 100644 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -572,6 +572,8 @@ sub process_request my $distname = undef; my $arch = undef; my $path = undef; + if ($::XCATSITEVALS{"httpmethod"}) { $httpmethod = $::XCATSITEVALS{"httpmethod"}; } + if ($::XCATSITEVALS{"httpport"}) { $httpport = $::XCATSITEVALS{"httpport"}; } if ($request->{command}->[0] eq 'copycd') { return copycd($request, $callback, $doreq);