diff options
| author | damien <damien@mandriva.com> | 2001-08-23 16:22:14 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-08-23 16:22:14 +0000 |
| commit | acd6626823cdaee319ed9c118580c7e63753ed8e (patch) | |
| tree | 90305164589e2f9e60c3af7203bac4ad2fa2cfd8 | |
| parent | 562106f4cd654792a1970042721a3e830a6ff3cd (diff) | |
| download | drakx-backup-do-not-use-acd6626823cdaee319ed9c118580c7e63753ed8e.tar drakx-backup-do-not-use-acd6626823cdaee319ed9c118580c7e63753ed8e.tar.gz drakx-backup-do-not-use-acd6626823cdaee319ed9c118580c7e63753ed8e.tar.bz2 drakx-backup-do-not-use-acd6626823cdaee319ed9c118580c7e63753ed8e.tar.xz drakx-backup-do-not-use-acd6626823cdaee319ed9c118580c7e63753ed8e.zip | |
at_boot connection,resolvconf in profiles
| -rw-r--r-- | perl-install/network/netconnect.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index bae9dc97b..c0760322d 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -209,7 +209,8 @@ ifdown eth0 } elsif ($nb == 1) { $netc->{internet_cnx_choice} = (keys %{$netc->{internet_cnx}})[0]; } - $netc->{at_boot} = $in->ask_yesorno(_("Network Configuration Wizard"), _("Do you want to start the connection at boot?")); + member($netc->{internet_cnx_choice}, ('modem', 'adsl', 'isdn')) and + $netc->{at_boot} = $in->ask_yesorno(_("Network Configuration Wizard"), _("Do you want to start the connection at boot?")); if ($netc->{internet_cnx_choice} ) { write_cnx_script($netc); } else { @@ -218,6 +219,7 @@ ifdown eth0 undef $netc->{NET_DEVICE}; } + write_initscript(); $::isStandalone and ask_connect_now(); step_3: @@ -406,6 +408,7 @@ DOMAINNAME2=$netc->{DOMAINNAME2}" ["$prefix/etc/ppp/ioptions2B", "iop2B"], ["$prefix/etc/isdn/isdn1B.conf", "isdn1B"], ["$prefix/etc/isdn/isdn2B.conf", "isdn2B"], + ["$prefix/etc/resolv.com", "resolv"], ) { my $file = "$prefix/etc/sysconfig/network-scripts/net_" . $_->[1] . "." . $a; -e ($_->[0]) and commands::cp("-f", $_->[0], $file) and chmod 0755, $file; @@ -428,6 +431,7 @@ sub set_profile { ["$prefix/etc/ppp/ioptions2B", "iop2B"], ["$prefix/etc/isdn/isdn1B.conf", "isdn1B"], ["$prefix/etc/isdn/isdn2B.conf", "isdn2B"], + ["$prefix/etc/resolv.conf", "resolv"], ) { my $c = "$prefix/etc/sysconfig/network-scripts/net_" . $_->[1] . "." . $profile; -e ($c) and commands::cp("-f", $c, $_->[0]); @@ -440,7 +444,7 @@ sub del_profile { $profile eq "default" and return; print "deleting $profile\n"; commands::rm("-f", "$prefix/etc/sysconfig/network-scripts/draknet_conf." . $profile); - commands::rm("-f", glob_("$prefix/etc/sysconfig/network-scripts/net_{up,down,prog,iop1B,iop2B,isdn1B,isdn2B}." . $profile)); + commands::rm("-f", glob_("$prefix/etc/sysconfig/network-scripts/net_{up,down,prog,iop1B,iop2B,isdn1B,isdn2B,resolv}." . $profile)); } sub add_profile { |