summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-06-03 13:24:34 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-06-03 13:24:34 +0000
commit2ccb592fc1dd28aa4c11be203a0f2b300743a726 (patch)
treee4445901c2864beee50b10b4ab045cc604beacf8
parent337801868e55146ca66221654d6295d0e24b01a7 (diff)
downloaddrakx-backup-do-not-use-2ccb592fc1dd28aa4c11be203a0f2b300743a726.tar
drakx-backup-do-not-use-2ccb592fc1dd28aa4c11be203a0f2b300743a726.tar.gz
drakx-backup-do-not-use-2ccb592fc1dd28aa4c11be203a0f2b300743a726.tar.bz2
drakx-backup-do-not-use-2ccb592fc1dd28aa4c11be203a0f2b300743a726.tar.xz
drakx-backup-do-not-use-2ccb592fc1dd28aa4c11be203a0f2b300743a726.zip
no_comment
-rw-r--r--perl-install/c/sbus.c3
-rw-r--r--perl-install/install_steps.pm7
-rw-r--r--perl-install/install_steps_auto_install.pm1
-rw-r--r--perl-install/sbus_probing/main.pm2
4 files changed, 6 insertions, 7 deletions
diff --git a/perl-install/c/sbus.c b/perl-install/c/sbus.c
index 1fed1f886..3de75fca2 100644
--- a/perl-install/c/sbus.c
+++ b/perl-install/c/sbus.c
@@ -19,11 +19,12 @@
*
*/
+#include <stdlib.h>
+
#ifdef __sparc__
#include <fcntl.h>
#include <unistd.h>
-#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
#include <asm/openpromio.h>
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index c209b56e8..9e2486d70 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -308,8 +308,8 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK!
my $time = time;
$ENV{DURING_INSTALL} = 1;
pkgs::install($o->{prefix}, $o->{isUpgrade}, \@toInstall, $packages->[1], $packages->[2]);
- run_program::rooted($o->{prefix}, 'ldconfig');
delete $ENV{DURING_INSTALL};
+ run_program::rooted($o->{prefix}, 'ldconfig') or die "ldconfig failed!";
log::l("Install took: ", formatTime(time - $time));
}
@@ -338,14 +338,11 @@ Consoles 1,3,4,7 may also contain interesting information";
#- why not? cuz weather is nice today :-) [pixel]
sync(); sync();
- #- call ldconfig at the end of package installation
- run_program::rooted($o->{prefix}, "ldconfig");
-
#- configure PCMCIA services if needed.
$o->pcmciaConfig();
#- for mandrake_firstime
- output "$o->{prefix}/var/lock/TMP_1ST", "";
+ touch "$o->{prefix}/var/lock/TMP_1ST";
#- remove the nasty acon...
run_program::rooted($o->{prefix}, "chkconfig", "--del", "acon") unless $ENV{LANGUAGE} =~ /ar/;
diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm
index a48154aea..6792708ca 100644
--- a/perl-install/install_steps_auto_install.pm
+++ b/perl-install/install_steps_auto_install.pm
@@ -35,6 +35,7 @@ sub exitInstall {
my ($o) = @_;
return if $o->{autoExitInstall};
+ print "\a";
print "Auto installation complete\n";
print "Press <Enter> to reboot\n";
<STDIN>;
diff --git a/perl-install/sbus_probing/main.pm b/perl-install/sbus_probing/main.pm
index fa40160ae..e5c3f1596 100644
--- a/perl-install/sbus_probing/main.pm
+++ b/perl-install/sbus_probing/main.pm
@@ -108,7 +108,7 @@ sub prom_walk($$$$) {
$result;
} ||
$prob_name eq 'leo' && c::prom_getproperty('model') =~ /501-2503/ && '_t' ||
- $prob_name eq 'tcx' && c::prom_getboot('tcx-8-bit') && '_8b' ||
+ $prob_name eq 'tcx' && c::prom_getbool('tcx-8-bit') && '_8b' ||
$prob_name eq 'afb' && sprintf "_btx%x", c::prom_getint('board_type') ||
$prob_name eq 'ffb' && sprintf "_btx%x", c::prom_getint('board_type'));