summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-09-30 21:10:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-09-30 21:10:54 +0000
commit70490528ebf1114241b2af3242339c4ef77838b8 (patch)
tree16529bb38874e12a089a66f1a211a8be23d4f527
parent1bfc67eb5efc9c1874a1286d63fbb9a11c955930 (diff)
downloaddrakx-70490528ebf1114241b2af3242339c4ef77838b8.tar
drakx-70490528ebf1114241b2af3242339c4ef77838b8.tar.gz
drakx-70490528ebf1114241b2af3242339c4ef77838b8.tar.bz2
drakx-70490528ebf1114241b2af3242339c4ef77838b8.tar.xz
drakx-70490528ebf1114241b2af3242339c4ef77838b8.zip
no need to escape " in /xxx \" xxx/
-rw-r--r--perl-install/install_any.pm2
-rw-r--r--perl-install/network/adsl.pm2
-rw-r--r--perl-install/network/network.pm2
3 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index e646d3930..f9b2acded 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -728,7 +728,7 @@ sub getAndSaveAutoInstallFloppy {
fs::umount($mountdir);
run_program::run("losetup", "-d", "/dev/loop6");
- substInFile { s/timeout.*//; s/^(\s*append\s*=\s*\".*)\"/$1 kickstart=floppy"/ } "$workdir/silo.conf"; #" for po
+ substInFile { s/timeout.*//; s/^(\s*append\s*=\s*".*)"/$1 kickstart=floppy"/ } "$workdir/silo.conf"; #" for po
#-TODO output "$workdir/ks.cfg", generate_ks_cfg($o);
output "$workdir/boot.msg", "\n7m",
"!! If you press enter, an auto-install is going to start.
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 372504570..a6bc82009 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -83,7 +83,7 @@ sub adsl_probe_info {
my %pppoe_conf; %pppoe_conf = getVarsFromSh($pppoe_file) if (! defined $adsl_type || $adsl_type =~ /pppoe/) && -f $pppoe_file;
my $login = $pppoe_conf{USER};
foreach (qw(/etc/ppp/peers/adsl /etc/ppp/options /etc/ppp/options.adsl)) {
- ($login) = map { if_(/^user\s+\"([^\"]+)\"/, $1) } cat_("$prefix/$_") if !$login && -r "$prefix/$_";
+ ($login) = map { if_(/^user\s+"([^"]+)"/, $1) } cat_("$prefix/$_") if !$login && -r "$prefix/$_";
}
($login) = map { if_(/\sname\s+([^ \n]+)/, $1) } cat_($pptp_file) if (! defined $adsl_type || $adsl_type =~ /pptp/) && -r $pptp_file;
my $passwd = passwd_by_login($login);
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 958690635..c1f433ec7 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -56,7 +56,7 @@ sub read_dhcpd_conf {
$file ||= "$::prefix/etc/dhcpd.conf";
{ option_routers => [ cat_($file) =~ /^\s*option routers\s+(\S+);/mg ],
subnet_mask => [ if_(cat_($file) =~ /^\s*option subnet-mask\s+(.*);/mg, split(' ', $1)) ],
- domain_name => [ if_(cat_($file) =~ /^\s*option domain-name\s+\"(.*)\";/mg, split(' ', $1)) ],
+ domain_name => [ if_(cat_($file) =~ /^\s*option domain-name\s+"(.*)";/mg, split(' ', $1)) ],
domain_name_servers => [ if_(cat_($file) =~ /^\s*option domain-name-servers\s+(.*);/m, split(' ', $1)) ],
dynamic_bootp => [ if_(cat_($file) =~ /^\s*range dynamic-bootp\s+\S+\.(\d+)\s+\S+\.(\d+)\s*;/m, split(' ', $1)) ],
default_lease_time => [ if_(cat_($file) =~ /^\s*default-lease-time\s+(.*);/m, split(' ', $1)) ],