From 14c73ed3e756c1fcd05b50eb8fd049d9f089aaae Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 8 Mar 2001 12:43:54 +0000
Subject: re-add miscellaneous step, but always hidden (aka automatic)

---
 perl-install/install2.pm                  | 13 +------------
 perl-install/install_steps_interactive.pm |  2 +-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index a2284b8da..785dd2c56 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -41,7 +41,7 @@ my (%installSteps, @orderedInstallSteps);
   setupSCSI          => [ __("Hard drive detection"), 1, 0, '' ],
   selectMouse        => [ __("Configure mouse"), 1, 1, '', "selectInstallClass" ],
   selectKeyboard     => [ __("Choose your keyboard"), 1, 1, '', "selectInstallClass" ],
-#-  miscellaneous      => [ __("Miscellaneous"), 1, 1, '!$::expert' ],
+  miscellaneous      => [ __("Miscellaneous"), 1, 1, 1 ],
   doPartitionDisks   => [ __("Setup filesystems"), 1, 0, '', "selectInstallClass" ],
   formatPartitions   => [ __("Format partitions"), 1, -1, '', "doPartitionDisks" ],
   choosePackages     => [ __("Choose packages to install"), 1, -2, '!$::expert', "formatPartitions" ],
@@ -266,17 +266,6 @@ sub miscellaneous {
             SECURITY => $o->{security},
 	    META_CLASS => $o->{meta_class} || 'PowerPack',
         });
-
-	my $f = "$o->{prefix}/etc/sysconfig/usb";
-	output $f,
-"USB=yes
-MOUSE=" . bool2yesno(detect_devices::usbMice()) . "
-KEYBOARD=" . bool2yesno(detect_devices::usbKeyboards()) . "
-STORAGE=" . bool2yesno(detect_devices::usbZips()) . "
-VISOR=no
-" if modules::get_alias("usb-interface") && ! -e $f;
-
-	install_any::fsck_option($o);
     } 'installPackages';
 }
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index eb92b6014..d8fdd7208 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -947,7 +947,7 @@ try to force installation even if that destroys the first partition?"));
 }
 
 #- deprecated
-sub miscellaneous {
+sub __deprecated__miscellaneous {
     return; 
 
     my ($o, $clicked) = @_;
-- 
cgit v1.2.1