From 31de738c99ce16ee26595d7bf2d6e9500a5a10b1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 5 Aug 2000 14:29:16 +0000
Subject: no_comment

---
 perl-install/any.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'perl-install/any.pm')

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.
 }
 
-- 
cgit v1.2.1