4 files changed, 26 insertions, 22 deletions

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 176d0a430..c3214b184 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -270,6 +270,8 @@ sub testFinalConfig($;$) {
     #- create a link from the non-prefixed /tmp/.X11-unix/X9 to the prefixed one
     #- that way, you can talk to :9 without doing a chroot
     symlinkf "$prefix/tmp/.X11-unix/X9", "/tmp/.X11-unix/X9" if $prefix;
+    run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/xfs", "stop");
+    run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/xfs", "start");
 
     my $f_err = "$prefix/tmp/Xoutput";
     my $pid;
@@ -366,9 +368,9 @@ sub autoDefaultDepth($$) {
     my ($card, $wres_wanted) = @_;
     my ($best, $depth);
 
-    if ($card->{server} eq 'FBDev') {
-	16; #- assume 16 bits depth for this case.
-    } else {
+#    if ($card->{server} eq 'FBDev') {
+#	16; #- assume 16 bits depth for this case.
+#    } else {
 	while (my ($d, $r) = each %{$card->{depth}}) {
 	    $depth = $depth ? max($depth, $d) : $d;
 
@@ -376,7 +378,7 @@ sub autoDefaultDepth($$) {
 	    $best = $best ? max($best, $d) : $d if $r->[0][0] >= $wres_wanted;
 	}
 	$best || $depth or die "no valid modes";
-    }
+#    }
 }
 
 sub autoDefaultResolution(;$) {
diff --git a/perl-install/help.pm b/perl-install/help.pm
index 6b937c138..abbb66c28 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -4,21 +4,21 @@ use common qw(:common);
 
 %steps = (
 selectLanguage =>
- __("
-    <h1>Pixel's links</h1>
-
-      <h2>Search</h2>
-      Quelques sites de recherche :
-      <a href=\"http://www.metacrawler.com\">MetaCrawler</a>,
-      <a href=\"http://www.dejanews.com\">dejanews</a>,
-      <a href=\"http://www.yahoo.fr\">yahoo(fr)</a>,
-      <a href=\"http://www.yahoo.com\">yahoo</a>,
-      <a href=\"http://www.infoseek.com\">infoseek</a>,
-      <a href=\"http://www.altavista.com\">altavista</a>,
-      <a href=\"http://www.excite.com\">excite</a>
-
-
-Choose preferred language for install and system usage."),
+#- __("
+#-    <h1>Pixel's links</h1>
+#-
+#-      <h2>Search</h2>
+#-      Quelques sites de recherche :
+#-      <a href=\"http://www.metacrawler.com\">MetaCrawler</a>,
+#-      <a href=\"http://www.dejanews.com\">dejanews</a>,
+#-      <a href=\"http://www.yahoo.fr\">yahoo(fr)</a>,
+#-      <a href=\"http://www.yahoo.com\">yahoo</a>,
+#-      <a href=\"http://www.infoseek.com\">infoseek</a>,
+#-      <a href=\"http://www.altavista.com\">altavista</a>,
+#-      <a href=\"http://www.excite.com\">excite</a>
+
+
+__("Choose preferred language for install and system usage."),
 
 selectKeyboard =>
  __("Choose the layout corresponding to your keyboard from the list above"),
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 3765fb147..294601366 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -182,7 +182,9 @@ $o = $::o = {
     steps        => \%installSteps,
     orderedSteps => \@orderedInstallSteps,
 
-    base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which perl-base) ],
+#-    base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which perl-base) ],
+    base => [ qw(basesystem sed initscripts console-tools mkbootdisk anacron rhs-hwdiag utempter ldconfig chkconfig ntsysv mktemp setup filesystem SysVinit bdflush crontabs dev e2fsprogs etcskel fileutils findutils getty_ps grep groff gzip hdparm info initscripts isapnptools kbdconfig kernel less ldconfig lilo logrotate losetup man mkinitrd mingetty modutils mount net-tools passwd procmail procps psmisc mandrake-release rootfiles rpm sash sed setconsole setserial shadow-utils sh-utils slocate stat sysklogd tar termcap textutils time tmpwatch util-linux vim-minimal vixie-cron which cpio perl) ],
+
 #- for the list of fields available for user and superuser, see @etc_pass_fields in install_steps.pm
 #-    intf => [ { DEVICE => "eth0", IPADDR => '1.2.3.4', NETMASK => '255.255.255.128' } ],
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 752b8b8c1..d2652c092 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -569,8 +569,8 @@ _("Color depth options") => { val => \$o->{printer}{BITSPERPIXEL}, type => 'list
 		    $pidlpd = (cat_("$o->{prefix}$_"))[0]; kill 'TERM', $pidlpd if $pidlpd;
 		    unlink "$o->{prefix}$_";
 		}
-		run_program::rooted($o->{prefix}, "lprm", "-P$o->{printer}{QUEUE}", "-");
-		run_program::rooted($o->{prefix}, "lpd");
+		run_program::rooted($o->{prefix}, "lprm", "-P$o->{printer}{QUEUE}", "-"); sleep 1;
+		run_program::rooted($o->{prefix}, "lpd"); sleep 1;
 
 		run_program::rooted($o->{prefix}, "lpr", "-P$o->{printer}{QUEUE}", $testpage);
 	    }

path: root/rescue/rescue-doc

#!/usr/bin/perl

sub output { my $f = shift; local *F; open F, ">$f" or die "output in file $f failed: $!\n"; print F foreach @_; }

output('/tmp/rescue-doc-contents', q(
     Information regarding problems not directly addressed
                     by this rescue.


Are you certain "rescue mode" is the best tool for your specific
problem?

The rescue system on this CD is a very basic text-based
environment for rescuing systems that no longer boot. You will
not find an easy-to-use graphical environment in this rescue
system, nor the Mandrake detection/configuration libraries.


The vast majority of problems that can affect a Linux system are
much easier to repair on a running system than by booting into
"rescue mode". In fact, there are very few problems which aren't
easier to resolve in the comfortable environment of a fully
installed Mandrakelinux system than in this spartan "rescue
system" shell. Some of the most common problems include:

- bad or missing X (video display) configuration
- adding/removing/reconfiguring hardware
- repairing problems caused by installing third-party software
  with the "--force" and "--nodeps" options

The general rule of thumb is: "If you can boot into the Linux
system without using rescue mode or this CD, there is no real
reason to use the rescue CD".


However, if you can no longer boot into the system, the rescue
system is the right tool. Some common examples include:

- If you previously changed some parameters in the /etc/fstab and
  the system will no longer boot, fix the offending line while in
  rescue mode, then try to boot normally into your system.

- If the problem cannot be completely resolved in rescue mode
  (for example, if you need to reconfigure the video display),
  just modify what's necessary to boot into a running system,
  then complete the fix from there.

In case you have found a new problem which should be handled by
"rescue mode" but currently isn't, please report it to
<gc@mandrakesoft.com>.

For more information on troubleshooting a Mandrakelinux system,
please consult the official manuals, the documentation on
MandrakeLinux.com, MandrakeUser.org, troubleshooting articles on
MandrakeForum.com, or the MandrakeExpert.com support forum.

<press 'q' (qwerty keyboard) to continue>
));

exec 'less /tmp/rescue-doc-contents';