/[smeserver]/rpms/e-smith-base/sme7/e-smith-base-4.18.0-ethdriver.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme7/e-smith-base-4.18.0-ethdriver.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.2 - (hide annotations) (download)
Wed Mar 26 17:01:38 2008 UTC (16 years, 7 months ago) by slords
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
* Wed Mar 26 2008 Shad L. Lords <slords@mail.com> 4.18.1-2
- Fix gettext strings returned by password checks [SME: 4104]

1 slords 1.1 diff -Nur -x '*.orig' -x '*.rej' e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm
2     --- e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm 2007-03-06 11:16:06.000000000 -0700
3     +++ mezzanine_patched_e-smith-base-4.18.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm 2007-03-06 11:15:35.000000000 -0700
4     @@ -70,14 +70,6 @@
5     }
6     }
7    
8     - if ( ($confEntry eq "EthernetDriver2") ) {
9     - my ($parameter, $driver, $chipset) = split (/\s+/, $adapters[0], 3);
10     - if ($driver eq $db->get_value("EthernetDriver1"))
11     - {
12     - @adapters = reverse @adapters;
13     - }
14     - }
15     -
16     if ( scalar @adapters == 0 )
17     {
18     $adapterList = " (none)";
19     @@ -96,6 +88,7 @@
20    
21     my %tag2driver;
22     my @args;
23     + my $default;
24    
25     my $existing_driver = $db->get_value($confEntry);
26    
27     @@ -104,17 +97,16 @@
28     my ($parameter, $driver, $chipset) = split (/\s+/, $adapter, 3);
29     chomp($chipset);
30    
31     - unless ($driver eq $existing_driver)
32     - {
33     - my $tag = ++$item . ".";
34     + my $tag = ++$item . ".";
35    
36     - $tag2driver{$tag} = $driver;
37     + $tag2driver{$tag} = $driver;
38    
39     - my $display_name = gettext("Use") . " " . ${driver} . " " .
40     - gettext("for chipset") . " " . ${chipset};
41     + my $display_name = gettext("Use") . " " . ${driver} . " " .
42     + gettext("for chipset") . " " . ${chipset};
43    
44     - push(@args, $tag, substr($display_name, 0, 65));
45     - }
46     + push(@args, $tag, substr($display_name, 0, 65));
47     +
48     + $default = $tag if ${driver} eq $db->get_value($confEntry);
49     }
50    
51     push( @args,
52     @@ -128,7 +120,7 @@
53     (
54     title => sprintf(gettext("Select %s network ethernet driver"),
55     $ifName),
56     - default => $db->get_value($confEntry),
57     + default => $default,
58     text =>
59     sprintf(gettext("You now need to select the proper driver for your %s network ethernet adapter. The server can attempt to do this automatically, or you can do it manually - either by specifying the model of your ethernet adapter or by directly choosing a driver."),
60     $ifName) .

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed