diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-12-09 14:30:03 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-12-09 14:30:03 +0000 |
| commit | 9543adf58807502439c2a805d23ffad4425ebcab (patch) | |
| tree | 6370723e4e3748e77ba4a55b1593650507a7c6b4 | |
| parent | 8fb5b2e7f62e701398a20c1bd47518236237848b (diff) | |
| download | drakx-9543adf58807502439c2a805d23ffad4425ebcab.tar drakx-9543adf58807502439c2a805d23ffad4425ebcab.tar.gz drakx-9543adf58807502439c2a805d23ffad4425ebcab.tar.bz2 drakx-9543adf58807502439c2a805d23ffad4425ebcab.tar.xz drakx-9543adf58807502439c2a805d23ffad4425ebcab.zip | |
(ask_network) fix a crash by lazy loading when needed services (Dave
Hodgins, mga#8335)
perl_checker didn't find it b/c it saw a chain of module require (but
in reallity it's not here b/c only one or a couple subs actually lazy
load most modules in that chain so the odds of it being done are 0 in
practice :-( )
Xconfig::glx -> detect_devices -> fs::proc_partitions ->
partition_table -> fs -> fs::remote::* -> network::network ->
network::shorewall -> services
| -rw-r--r-- | perl-install/NEWS | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/finish-install | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 5c521b695..80a5ab922 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,7 @@ +- finish-install: + o fix a crash by lazy loading services when needed + (Dave Hodgins, mga#8335) + Version 15.2 - 7 December 2012 - drakboot: diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install index fc91491cd..8a7483cb7 100755 --- a/perl-install/standalone/finish-install +++ b/perl-install/standalone/finish-install @@ -102,6 +102,7 @@ sub ask_country() { sub ask_network() { require network::tools; + require services; return if network::tools::has_network_connection(); #- test again connection after waiting for network-up service |