arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-Correct node deletion if a simple format mac entry is referenced, or none at all.

Browse Source 
-Factor out plugin call in preparation for hierarchical dispatch


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@323 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2008-01-24 13:37:34 +00:00
parent 941bee58ef
commit 7f2a3b8ea4
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xCAT-server-2.0/lib/xcat/plugins/dhcp.pm
View File

@ -37,6 +37,7 @@ sub delnode {
my $mac;
my $hname;
($mac,$hname) = split (/!/,$mace);
unless ($hmame) { $hmame = $node; }
print $omshell "new host\n";
print $omshell "set name = \"$hname\"\n"; #Find and destroy conflict name
print $omshell "open\n";

11
xCAT-server-2.0/sbin/xcatd
View File

@ -535,7 +535,8 @@ sub plugin_command {
$req->{node}=\@nodes;
}
no strict "refs";
${"xCAT_plugin::".$modname."::"}{process_request}->($req,$callback,\&do_request);
dispatch_request($req,$callback,$modname);
#${"xCAT_plugin::".$modname."::"}{process_request}->($req,$callback,\&do_request);
$$progname=$oldprogname;
if ($sock) {
close($parent_fd);
@ -561,6 +562,14 @@ sub plugin_command {
}
sub dispatch_request {
my $req = shift;
my $callback = shift;
my $modname = shift;
no strict "refs";
${"xCAT_plugin::".$modname."::"}{process_request}->($req,$callback,\&do_request);
}
sub do_request {
my $req = shift;
my $second = shift;