From c254cc642566efc1e156c603760cd208eefeb556 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Thu, 10 Mar 2005 20:06:58 +0000
Subject: don't spawn a shell if stage2 isn't run directly

---
 perl-install/install_any.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'perl-install/install_any.pm')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index e74de756d..e1d9a8e66 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -285,8 +285,12 @@ sub getNextStep {
     find { !$o->{steps}{$_}{done} && $o->{steps}{$_}{reachable} } @{$o->{orderedSteps}};
 }
 
+sub dont_run_directly_stage2() {
+    readlink("/usr/bin/runinstall2") eq "runinstall2.sh";
+}
+
 sub spawnShell() {
-    return if $::o->{localInstall} || $::testing;
+    return if $::o->{localInstall} || $::testing || dont_run_directly_stage2();
 
     if (my $shellpid = fork()) {
         output('/var/run/drakx_shell.pid', $shellpid);
-- 
cgit v1.2.1