summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-11-10 09:54:02 +0000
committerFrancois Pons <fpons@mandriva.com>1999-11-10 09:54:02 +0000
commite493243f413480eaab130284867a2fcb0f2b649d (patch)
tree7801f6b1f64b2124d4a0781e94d7caa3179b3082
parentbff2e783f7d82e9450d38f931820f95f98012e58 (diff)
downloaddrakx-backup-do-not-use-e493243f413480eaab130284867a2fcb0f2b649d.tar
drakx-backup-do-not-use-e493243f413480eaab130284867a2fcb0f2b649d.tar.gz
drakx-backup-do-not-use-e493243f413480eaab130284867a2fcb0f2b649d.tar.bz2
drakx-backup-do-not-use-e493243f413480eaab130284867a2fcb0f2b649d.tar.xz
drakx-backup-do-not-use-e493243f413480eaab130284867a2fcb0f2b649d.zip
*** empty log message ***
-rw-r--r--perl-install/install2.pm4
-rw-r--r--perl-install/install_steps.pm4
-rw-r--r--perl-install/install_steps_interactive.pm2
3 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 574b59744..cbc7cc200 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -183,8 +183,8 @@ $o = $::o = {
steps => \%installSteps,
orderedSteps => \@orderedInstallSteps,
-#-GOLD base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which perl-base) ],
- base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which cpio perl) ],
+#-GOLD base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm ash setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which perl-base) ],
+ base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm ash setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which cpio perl) ],
#- for the list of fields available for user and superuser, see @etc_pass_fields in install_steps.pm
#- intf => [ { DEVICE => "eth0", IPADDR => '1.2.3.4', NETMASK => '255.255.255.128' } ],
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index b3bc59a17..bcb327c72 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -276,13 +276,13 @@ sub pppConfig {
my @l = cat_("$o->{prefix}/etc/ppp/pap-secrets");
my $replaced = 0;
do { $replaced ||= 1
- if s/^\s*$toreplace{connection}\s+ppp0\s+(\S+)/$toreplace{connection} ppp0 $toreplace{passwd}/; } foreach @l;
+ if s/^\s*$toreplace{login}\s+ppp0\s+(\S+)/$toreplace{login} ppp0 $toreplace{passwd}/; } foreach @l;
if ($replaced) {
open F, ">$o->{prefix}/etc/ppp/pap-secrets" or die "Can't open $o->{prefix}/etc/ppp/pap-secrets $!";
print F @l;
} else {
open F, ">>$o->{prefix}/etc/ppp/pap-secrets" or die "Can't open $o->{prefix}/etc/ppp/pap-secrets $!";
- print F "$toreplace{connection} ppp0 $toreplace{passwd}\n";
+ print F "$toreplace{login} ppp0 $toreplace{passwd}\n";
}
} elsif ($o->{modem}{auth} eq 'Terminal-based' || $o->{modem}{auth} eq 'Script-based') {
template2file("/usr/share/ifcfg-ppp.script.in", "$o->{prefix}/etc/sysconfig/network-scripts/ifcfg-ppp0", %toreplace);
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index c23709907..81ba51710 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -347,7 +347,7 @@ sub pppConfig {
my ($o) = @_;
my $m = $o->{modem} ||= {};
- unless ($m->{device} || $::expert && $o->ask_yesorno('', _("Try to find a modem?"), 1)) {
+ unless ($m->{device} || $::expert && !$o->ask_yesorno('', _("Try to find a modem?"), 1)) {
foreach (0..3) {
next if readlink("$o->{prefix}/dev/mouse") =~ /ttyS$_/;
detect_devices::hasModem("$o->{prefix}/dev/ttyS$_")