summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-05-05 18:45:23 +0000
committerFrancois Pons <fpons@mandriva.com>2000-05-05 18:45:23 +0000
commit969bc065596476bce5cfed0bb7ffd263f48eb1d5 (patch)
tree8f890d39f7b1ccfa6dbeb8f7cc3281748ee30f46 /perl-install/install2.pm
parent8255a2010a0698471fb35f42b1ebcad3462f153a (diff)
downloaddrakx-backup-do-not-use-969bc065596476bce5cfed0bb7ffd263f48eb1d5.tar
drakx-backup-do-not-use-969bc065596476bce5cfed0bb7ffd263f48eb1d5.tar.gz
drakx-backup-do-not-use-969bc065596476bce5cfed0bb7ffd263f48eb1d5.tar.bz2
drakx-backup-do-not-use-969bc065596476bce5cfed0bb7ffd263f48eb1d5.tar.xz
drakx-backup-do-not-use-969bc065596476bce5cfed0bb7ffd263f48eb1d5.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm13
1 files changed, 6 insertions, 7 deletions
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';