summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-03-10 20:06:58 +0000
committerOlivier Blin <oblin@mandriva.org>2005-03-10 20:06:58 +0000
commitc254cc642566efc1e156c603760cd208eefeb556 (patch)
treef7cd1821615a94b7acb9db0cdd07c6897dbac68e
parentcf7ab7c2192aaa2a11fe251990a0475c150f261e (diff)
downloaddrakx-c254cc642566efc1e156c603760cd208eefeb556.tar
drakx-c254cc642566efc1e156c603760cd208eefeb556.tar.gz
drakx-c254cc642566efc1e156c603760cd208eefeb556.tar.bz2
drakx-c254cc642566efc1e156c603760cd208eefeb556.tar.xz
drakx-c254cc642566efc1e156c603760cd208eefeb556.zip
don't spawn a shell if stage2 isn't run directly
-rw-r--r--perl-install/install_any.pm6
1 files changed, 5 insertions, 1 deletions
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);