From d6c00adf084ea92e1db0735ea8f0a19157882391 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 26 Sep 2000 15:59:37 +0000
Subject: *** empty log message ***

---
 perl-install/install_steps_interactive.pm |  3 +--
 perl-install/live_install                 | 18 +++++++++++++++++-
 perl-install/printerdrake.pm              |  5 +++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 79a9e07c6..66ef4faf1 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -138,7 +138,6 @@ are you ready to answer that kind of questions?"),
 					      first(list2kv(@c)), ${{reverse %c}}{$::beginner ? "beginner" : $::expert ? "expert" : "specific"},
 					      [ __("Install"), __("Rescue") ], $o->{isUpgrade} ? "Rescue" : "Install") eq "Rescue";
 
-    print STDERR "isUpgrade=$o->{isUpgrade}\n";
     if ($::corporate || $::beginner) {
 	delete $o->{installClass};
     } else {
@@ -912,7 +911,7 @@ sub configureX {
     #- strange, xfs must not be started twice...
     #- trying to stop and restart it does nothing good too...
     my $xfs_started if 0;
-    run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/xfs", "start") unless $xfs_started;
+    run_program::rooted($o->{prefix}, "/etc/rc.d/init.d/xfs", "start") unless $::live || $xfs_started;
     $xfs_started = 1;
 
     { local $::testing = 0; #- unset testing
diff --git a/perl-install/live_install b/perl-install/live_install
index dcd211ea7..8ac72bb34 100755
--- a/perl-install/live_install
+++ b/perl-install/live_install
@@ -28,12 +28,28 @@ if [ -x "/tmp/drakx/mdkinst/usr/bin/perl-install/live_install2" ]; then
     fi
     ln -sf /tmp/drakx/mdkinst/usr/bin/packdrake /usr/bin/packdrake
 
+    for i in MonitorsDB CardsNames Cards+
+    do
+	if [ -e /usr/X11R6/lib/X11/$i ]; then
+	    mv /usr/X11R6/lib/X11/$i /tmp/drakx/mdkinst
+	fi
+	ln -sf /tmp/drakx/mdkinst/usr/X11R6/lib/X11/$i /usr/X11R6/lib/X11/$i
+    done
+
     # start DrakX
     ../../../lib/ld-linux.so.2 ../perl ./live_install2
 
+    for i in MonitorsDB CardsNames Cards+
+    do
+	rm -f /usr/X11R6/lib/X11/$i
+	if [ -e /tmp/drakx/mdkinst/$i ]; then
+	    mv /tmp/drakx/mdkinst/$i /usr/X11R6/lin/X11/$i
+	fi
+    done
+
     rm -f /usr/bin/packdrake
     if [ -x /tmp/drakx/mdkinst/packdrake ]; then
-	mv /tmp/drakx/mdkinst/packdrake.so /usr/bin/packdrake
+	mv /tmp/drakx/mdkinst/packdrake /usr/bin/packdrake
     fi
 
     rm -f $perlcoredir/libperl.so
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index de5a99b6a..6d273424b 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -44,6 +44,7 @@ sub setup_local($$$) {
     $printer->{DEVICE} = $port[0] if $port[0];
 
     if ($in) {
+	$::expert or $in->set_help('configurePrinterDev');
 	return if !$in->ask_from_entries_refH(_("Local Printer Device"),
 _("What device is your printer connected to 
 (note that /dev/lp0 is equivalent to LPT1:)?\n") . (join "\n", @str), [
@@ -181,6 +182,7 @@ sub setup_gsdriver_cups($$$;$) {
     my ($printer, $in, $install, $upNetwork) = @_;
     my $testpage = "/usr/share/cups/data/testprint.ps";
 
+    $in->set_help('configurePrinterType');
     while (1) {
 	$printer->{cupsDescr} ||= printer::get_descr_from_ppd($printer);
 	$printer->{cupsDescr} = $in->ask_from_treelist('', _("What type of printer do you have?"), '|',
@@ -371,6 +373,7 @@ You can add some more or change the existing ones."),
 	$printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue; #- keep in mind old name of queue (in case of changing)
 
 	while ($continue) {
+	    $in->set_help('configurePrinterConnected');
 	    $printer::printer_type_inv{$printer->{TYPE}} or $printer->{TYPE} = printer::default_printer_type($printer);
 	    $printer->{str_type} = $printer::printer_type_inv{$printer->{TYPE}};
 	    if ($printer->{mode} eq 'CUPS') {
@@ -392,6 +395,7 @@ In case of doubt, select \"Remote CUPS server\"."),
 		    $printer->{TYPE} = $printer::printer_type{$printer->{str_type}};
 		}
 		$printer->{TYPE} eq 'CUPS' and return; #- exit printer configuration.
+		$in->set_help('configurePrinterLocal');
 		$in->ask_from_entries_refH([_("Select Printer Connection"), _("Ok"),
 					    $::beginner || !$printer->{configured}{$printer->{QUEUE}} ? () : _("Remove queue")],
 _("Every printer need a name (for example lp).
@@ -411,6 +415,7 @@ _("Location") => { val => \$printer->{Location} },
 							       $printer->{str_type},
 							      );
 		} else {
+		    $in->set_help('configurePrinterLocal');
 		    $in->ask_from_entries_refH([_("Select Printer Connection"), _("Ok"), $::beginner ? () : _("Remove queue")],
 _("Every print queue (which print jobs are directed to) needs a
 name (often lp) and a spool directory associated with it. What
-- 
cgit v1.2.1