Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions aii-core/src/main/perl/Shellfe.pm
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,22 @@ sub run_plugin
$plug->set_active_config($st->{configuration});
}

my @params;
if ($modulename eq "dhcp") {
if ($self->option("rescue") && $method eq CONFIGURE){
$self->debug (4, "Setting params for DHCP plugin and rescue mode");
@params = ($st->{configuration}, "rescue");
}
else {
$self->debug (4, "Setting params for DHCP plugin and non-rescue mode");
@params = ($st->{configuration}, "none");
}
}
else {
$self->debug (4, "Setting generic params");
@params = ($st->{configuration});
}

# The plugin method has to return success
my $res = eval { $plug->$method ($st->{configuration}) };
if ($@) {
Expand Down
6 changes: 6 additions & 0 deletions aii-dhcp/src/main/perl/dhcp.pm
Original file line number Diff line number Diff line change
Expand Up @@ -340,10 +340,16 @@ sub Configure
if ($opts->{tftpserver}) {
$tftpserver = $opts->{tftpserver};
}

if ($opts->{filename}) {
$filename = $opts->{filename};
$filename =~ s/BOOTSRVIP/$server_ip/;
}

if ($opts->{rescue}) {
$filename = $opts->{rescue};
}

if ($opts->{options}) {
foreach my $k (sort keys %{$opts->{options}}) {
$additional .= "option $k $opts->{options}->{$k};\n";
Expand Down