1 |
wellsi |
1.1 |
diff -ruN e-smith-base-5.2.0.old/root/usr/lib/perl5/site_perl/esmith/console/configure.pm e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm |
2 |
|
|
--- e-smith-base-5.2.0.old/root/usr/lib/perl5/site_perl/esmith/console/configure.pm 2012-02-05 00:14:41.000000000 +0000 |
3 |
|
|
+++ e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm 2012-03-17 04:33:45.000000000 +0000 |
4 |
|
|
@@ -81,21 +81,23 @@ |
5 |
|
|
|
6 |
|
|
foreach my $adapter ( @adapters ) |
7 |
|
|
{ |
8 |
|
|
- my ($parameter, $driver, $hwaddr, $chipset) = split (/\s+/, $adapter, 4); |
9 |
|
|
+ my ($parameter, $driver, $hwaddr, $chipset) = split (/\t/, $adapter, 4); |
10 |
|
|
chomp($chipset); |
11 |
|
|
+ |
12 |
|
|
+ #Ensure these are defined to at least "N/A" as no selection is shown if these are not defined. |
13 |
|
|
+ $hwaddr = "N/A" unless $hwaddr; |
14 |
|
|
+ $driver = "N/A" unless $driver; |
15 |
|
|
|
16 |
|
|
my $tag = ++$item . "."; |
17 |
|
|
|
18 |
|
|
$tag2driver{$tag} = $driver; |
19 |
|
|
$tag2hwaddr{$tag} = $hwaddr; |
20 |
|
|
- |
21 |
|
|
- my $display_name = gettext("Use") . " " . ${driver} . " " . |
22 |
|
|
- gettext("for chipset") . " " . ${chipset}; |
23 |
|
|
- |
24 |
|
|
- push(@args, $tag, substr($display_name, 0, 65)); |
25 |
|
|
+ |
26 |
|
|
+ my $display_name = gettext("Use") ." ". ${driver}. " " . $hwaddr ." ". ${chipset}; |
27 |
|
|
|
28 |
|
|
if ($hwaddr ne $skip) |
29 |
|
|
{ |
30 |
|
|
+ push(@args, $tag, substr($display_name, 0, 65)); |
31 |
|
|
$default = $tag if $hwaddr eq $existing_hwaddr; |
32 |
|
|
$default ||= $tag; |
33 |
|
|
} |
34 |
|
|
|
35 |
|
|
|
36 |
|
|
|
37 |
|
|
|