- move any::pppConfig() to network::modem::ppp_configure()

- move any::miscellaneousNetwork() to network::network::proxy_configure()
  (and uses the parameter instead of $::o->{miscellaneous})
- move network::network::miscellaneousNetwork() to network::network::miscellaneous_choose()
  (and do not export it)
  (and uses a parameter instead of $::o->{miscellaneous})
- move network::modem::pppConfig() to network::modem::ppp_choose()
  (and change parameter order, and drop unused parameter $intf)
- do not export network::network::write_interface_conf()
  (since it is only used locally (?))
- cleanup network::network::write_interface_conf()
  (one still needs to pass $::o->{miscellaneous}{track_network_id} more
  cleanly, and use run_program::rooted when calling /sbin/ip)

1 files changed, 1 insertions, 1 deletions

diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 410b81e13..f9d97e00c 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -207,7 +207,7 @@ such as ``mybox.mylab.myco.com''."),
     } else {
 	configureNetworkNet($in, $netc, $last ||= {}, @l) or goto configureNetwork_step_1;
     }
-    miscellaneousNetwork($in) or goto configureNetwork_step_1;
+    network::network::miscellaneous_choose($in, $::o->{miscellaneous} ||= {}) or goto configureNetwork_step_1;
     1;
 }