summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-10-09 19:34:02 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-10-09 19:34:02 +0000
commite5b54b7ab34e58b34daaf89e8ee001f70ca9e6ee (patch)
tree2df17c2de770801cb7792978b8ace83b7d55a81c
parent5dc9147d206037548eace68caaaceeeb70849d81 (diff)
downloaddrakx-e5b54b7ab34e58b34daaf89e8ee001f70ca9e6ee.tar
drakx-e5b54b7ab34e58b34daaf89e8ee001f70ca9e6ee.tar.gz
drakx-e5b54b7ab34e58b34daaf89e8ee001f70ca9e6ee.tar.bz2
drakx-e5b54b7ab34e58b34daaf89e8ee001f70ca9e6ee.tar.xz
drakx-e5b54b7ab34e58b34daaf89e8ee001f70ca9e6ee.zip
first shot as starting up mandrake-move from install2.pm as well (so many code shared)
-rw-r--r--perl-install/install2.pm11
1 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index e2d4b6368..d021f37c8 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -399,6 +399,7 @@ sub main {
nomouseprobe => sub { $o->{nomouseprobe} = $v },
blank => sub { $o->{blank} = $::blank = 1 },
updatemodules => sub { $o->{updatemodules} = 1 },
+ move => sub { $::move = 1 },
}}{lc $n}; &$f if $f;
} %cmdline;
@@ -421,10 +422,18 @@ sub main {
unlink $_ foreach "/modules/modules.mar", "/sbin/stage1";
}
- print STDERR "in second stage install\n";
+ print STDERR "in second stage\n";
log::openLog(($::testing || $o->{localInstall}) && 'debug.log');
log::l("second stage install running (", any::drakx_version(), ")");
+ if ($::move) {
+ require move;
+ move::init();
+ $::mdkinst = '';
+ } else {
+ $::mdkinst = 'Mandrake/mdkinst';
+ }
+
$o->{prefix} = $::prefix = $::testing ? "/tmp/test-perl-install" : $::live ? "" : "/mnt";
$o->{isUpgrade} = 1 if $::live;
mkdir $o->{prefix}, 0755;