summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-02-11 14:03:23 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-02-11 14:03:23 +0000
commitb745f2f1842ecb629ee7f8fa405959e85bf68ada (patch)
treea68fc6e047cc7fdabe22f60b313c4063449d9b8f
parent32a83378c4a49d7b0bf6d574db66b52956a432c3 (diff)
downloaddrakx-b745f2f1842ecb629ee7f8fa405959e85bf68ada.tar
drakx-b745f2f1842ecb629ee7f8fa405959e85bf68ada.tar.gz
drakx-b745f2f1842ecb629ee7f8fa405959e85bf68ada.tar.bz2
drakx-b745f2f1842ecb629ee7f8fa405959e85bf68ada.tar.xz
drakx-b745f2f1842ecb629ee7f8fa405959e85bf68ada.zip
no_comment
-rw-r--r--perl-install/ChangeLog10
-rw-r--r--perl-install/install2.pm1
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/install_steps_interactive.pm2
4 files changed, 12 insertions, 3 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 47007a780..295eefe73 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,7 +1,17 @@
2000-02-11 Pixel <pixel@mandrakesoft.com>
+ * install2.pm (main): add a callback on SEGV
+ -> message printed
+ -> that way, ENDs are called (otherwise skipped)
+
* install_steps_interactive.pm (setup_thiskind): handles the undef
value returned by load_thiskind
+
+ * install_steps_interactive.pm (exitInstall): do not call
+ install_steps::exitInstall
+
+ * install_steps (exitInstall): removed
+ * install_steps (END): added (it does ejectCdrom)
* install_steps_interactive.pm (load_thiskind): returns undef if
error loading a module
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 9ad6af9b6..b1120e8d9 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -487,6 +487,7 @@ sub exitInstall { $o->exitInstall(getNextStep() eq "exitInstall") }
#-######################################################################################
sub main {
$SIG{__DIE__} = sub { chomp(my $err = $_[0]); log::l("warning: $err") };
+ $SIG{SEGV} = sub { my $msg = "Seems like memory is missing as the install crashes"; print "$msg\n"; log::l($msg) };
$::beginner = $::expert = $::g_auto_install = 0;
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 15cc11b37..78195440b 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -752,7 +752,7 @@ sub cleanIfFailedUpgrade($) {
}
#------------------------------------------------------------------------------
-sub exitInstall { install_any::ejectCdrom; }
+END { install_any::ejectCdrom }
#-######################################################################################
#- Wonderful perl :(
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index ed1ca1ecc..731c6ba3d 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1060,8 +1060,6 @@ Information on configuring your system is available in the post
install chapter of the Official Linux-Mandrake User's Guide.")) if $alldone && !$::g_auto_install;
$::global_wait = $o->wait_message('', _("Shutting down"));
-
- $o->SUPER::exitInstall;
}