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 |
|
|
{ |