summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-08-05 14:29:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-08-05 14:29:16 +0000
commit31de738c99ce16ee26595d7bf2d6e9500a5a10b1 (patch)
tree30cb27258fcac641440869517e35e28f29177eb1 /perl-install/any.pm
parentf093421759947c0e1020139c8b0bdb057105c074 (diff)
downloaddrakx-backup-do-not-use-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar
drakx-backup-do-not-use-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.gz
drakx-backup-do-not-use-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.bz2
drakx-backup-do-not-use-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.tar.xz
drakx-backup-do-not-use-31de738c99ce16ee26595d7bf2d6e9500a5a10b1.zip
no_comment
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm9
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index ec38ba7b1..7f59db74a 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -200,10 +200,11 @@ _("Default") => { val => \$default, type => 'bool' },
}
sub setAutologin {
- my ($prefix, $user, $wm) = @_;
- my $f="$prefix/etc/X11/xdm/xdm_config";
- substInFile { s/^(DisplayManager._0.autoUser).*\n//; $_ .= "DisplayManager._0.autoUser:\t$user\n" if eof } $f;
- substInFile { s/^(DisplayManager._0.autoString).*\n//; $_ .= "DisplayManager._0.autoString:\t$wm\n" if eof } $f;
+ my ($prefix, $user, $wm) = @_;
+ my $f = "$prefix/etc/X11/xdm/xdm_config";
+ my $t1 = "DisplayManager._0.autoUser:";
+ my $t2 = "DisplayManager._0.autoString:";
+ substInFile { s/^(\Q$t1\E|\Q$t2\E).*\n//; $_ .= "$t1\t$user\n$t2\t$wm\n" if eof && $user } $f;
# (dam's) : a patch for gdm is being done.
}