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

defect 3779: change the output of driver injection to make it sensible

Browse Source
This commit is contained in:
daniceexi
2013-09-25 01:49:56 -04:00
parent 239add6be2
commit 089855bcd2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@@ -3143,10 +3143,12 @@ sub insert_dd {
@rpm_drivers = keys %dnhash;
if (@rpm_list) {
if (@driver_list) {
if (@rpm_drivers) {
push @{$rsp->{data}}, "The drivers:".join(',', sort(@rpm_drivers))." from ".join(',', sort(@rpm_list))." have been injected to initrd.";
} elsif ($Injectalldriver) {
push @{$rsp->{data}}, "All the drivers from :".join(',', sort(@rpm_list))." have been injected to initrd.";
} else {
push @{$rsp->{data}}, "No driver was injected to initrd.";
}
}

6
xCAT-server/lib/xcat/plugins/sles.pm
View File

@@ -2298,10 +2298,10 @@ sub insert_dd () {
@rpm_drivers = keys %dnhash;
if (@rpm_list) {
if (@driver_list) {
if (@rpm_drivers) {
push @{$rsp->{data}}, "The drivers:".join(',', sort(@rpm_drivers))." from ".join(',', sort(@rpm_list))." have been injected to initrd.";
} elsif ($Injectalldriver) {
push @{$rsp->{data}}, "All the drivers from :".join(',', sort(@rpm_list))." have been injected to initrd.";
} else {
push @{$rsp->{data}}, "No driver was injected to initrd.";
}
}
xCAT::MsgUtils->message("I", $rsp, $callback);