From 969bc065596476bce5cfed0bb7ffd263f48eb1d5 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Fri, 5 May 2000 18:45:23 +0000
Subject: *** empty log message ***

---
 perl-install/install2.pm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 538ea1cbd..e7f7ee098 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -163,7 +163,7 @@ $o = $::o = {
                  QUEUE        => "lp",
                  SPOOLDIR     => "/var/spool/lpd/lp",
                  DBENTRY      => "PostScript",
-                 PAPERSIZE    => "letter",
+                 PAPERSIZE    => "",
                  CRLF         => 0,
                  AUTOSENDEOF  => 1,
 
@@ -387,12 +387,11 @@ sub miscellaneous {
         });
 	
 	my $f = "$o->{prefix}/etc/sysconfig/usb";
-	setVarsInSh($f, { 
-            MOUSE => bool2yesno($o->{mouse}{device} eq "usbmouse"),
-	    KBD => bool2yesno(int grep { /^keybdev\.c: Adding keyboard/ } detect_devices::syslog()),
-	    ZIP => bool2yesno(-d "/proc/scsi/usb"),
-	    getVarsFromSh($f),
-	});
+	my %usb = getVarsFromSh($f);
+	$usb{MOUSE} = bool2yesno($o->{mouse}{device} eq "usbmouse");
+	$usb{KBD} = bool2yesno(int grep { /^keybdev\.c: Adding keyboard/ } detect_devices::syslog());
+	$usb{ZIP} = bool2yesno(-d "/proc/scsi/usb");
+	setVarsInSh($f, \%usb);
 
 	install_any::fsck_option();
     } 'doInstallStep';
-- 
cgit v1.2.1