/[smeserver]/rpms/e-smith-base/sme8/e-smith-base-5.2.0-no-nic2.patch
ViewVC logotype

Annotation of /rpms/e-smith-base/sme8/e-smith-base-5.2.0-no-nic2.patch

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


Revision 1.1 - (hide annotations) (download)
Wed Mar 2 20:08:24 2011 UTC (13 years, 4 months ago) by snetram
Branch: MAIN
CVS Tags: e-smith-base-5_2_0-67_el5_sme, e-smith-base-5_2_0-71_el5_sme, e-smith-base-5_2_0-68_el5_sme, e-smith-base-5_2_0-77_el5_sme, e-smith-base-5_2_0-59_el5_sme, e-smith-base-5_2_0-78_el5_sme, e-smith-base-5_2_0-86_el5_sme, e-smith-base-5_2_0-76_el5_sme, e-smith-base-5_2_0-84_el5_sme, e-smith-base-5_2_0-65_el5_sme, e-smith-base-5_2_0-88_el5_sme, e-smith-base-5_2_0-64_el5_sme, e-smith-base-5_2_0-81_el5_sme, e-smith-base-5_2_0-82_el5_sme, e-smith-base-5_2_0-57_el5_sme, e-smith-base-5_2_0-89_el5_sme, e-smith-base-5_2_0-90_el5_sme, e-smith-base-5_2_0-87_el5_sme, e-smith-base-5_2_0-80_el5_sme, e-smith-base-5_2_0-70_el5_sme, e-smith-base-5_2_0-66_el5_sme, e-smith-base-5_2_0-63_el5_sme, e-smith-base-5_2_0-61_el5_sme, e-smith-base-5_2_0-60_el5_sme, e-smith-base-5_2_0-58_el5_sme, e-smith-base-5_2_0-85_el5_sme, e-smith-base-5_2_0-69_el5_sme, e-smith-base-5_2_0-79_el5_sme, e-smith-base-5_2_0-72_el5_sme, e-smith-base-5_2_0-75_el5_sme, e-smith-base-5_2_0-73_el5_sme, e-smith-base-5_2_0-62_el5_sme, e-smith-base-5_2_0-74_el5_sme, e-smith-base-5_2_0-83_el5_sme
* Wed Mar 2 2011 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-57.sme
- Handle no network interface scenario in console and bootstrap-console [SME: 6023]

1 snetram 1.1 diff -up e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm.no-nic2 e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm
2     --- e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm.no-nic2 2011-03-02 20:15:58.000000000 +0100
3     +++ e-smith-base-5.2.0/root/usr/lib/perl5/site_perl/esmith/console/configure.pm 2011-03-02 20:22:08.000000000 +0100
4     @@ -79,18 +79,6 @@ sub ethernetSelect($$)
5     $existing_hwaddr = $db->get_prop("InternalInterface", "HWAddress");
6     }
7    
8     - if ( @adapters == 0 ) {
9     -
10     - my ($rc, $choice) = $console->message_page
11     - (
12     - title => gettext("No network interfaces found"),
13     - text => gettext("The installer can't continue because no network interfaces are installed or recognised. Please install at least one network interface."),
14     - );
15     -
16     - return 'NONIC';
17     -
18     - }
19     -
20     foreach my $adapter ( @adapters )
21     {
22     my ($parameter, $driver, $hwaddr, $chipset) = split (/\s+/, $adapter, 4);
23     @@ -173,6 +161,24 @@ sub doit
24     @adapters = split(/\n/, esmith::ethernet::probeAdapters());
25    
26     #------------------------------------------------------------
27     + NO_NIC:
28     + #------------------------------------------------------------
29     +{
30     +
31     + if ( @adapters == 0 ) {
32     +
33     + ($rc, $choice) = $console->message_page
34     + (
35     + title => gettext("No network interfaces found"),
36     + text => gettext("The installer can't continue because no network interfaces are installed or recognised. Please install at least one network interface."),
37     + );
38     +
39     + goto QUIT1;
40     +
41     + }
42     +
43     +}
44     + #------------------------------------------------------------
45     DOMAIN_NAME:
46     #------------------------------------------------------------
47     {

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