summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--move/move.pm12
-rw-r--r--perl-install/install2.pm4
2 files changed, 8 insertions, 8 deletions
diff --git a/move/move.pm b/move/move.pm
index 640b89d13..39d4cd278 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -45,20 +45,24 @@ sub init {
modules::load_category('multimedia/sound');
- $o->{steps}{exitMove} = { reachable => 1 };
- $o->{orderedSteps} = [ qw(selectLanguage acceptLicense selectMouse selectKeyboard exitMove) ];
+ $o->{steps}{startMove} = { reachable => 1, text => "Start Move" };
+ $o->{orderedSteps} = [ qw(selectLanguage acceptLicense selectMouse selectKeyboard startMove) ];
member($_, @ALLOWED_LANGS) or delete $lang::langs{$_} foreach keys %lang::langs;
}
-sub exit() {
+sub install2::startMove {
+ my ($_o) = @_;
run_program::run('adduser', 'mdk');
output('/var/run/console.lock', 'mdk');
output('/var/run/console/mdk', 1);
run_program::run('pam_console_apply');
- run_program::run('su', 'mdk', 'startkde');
+ fork() or exec 'gmessage', '...' or c::_exit(0);
+
+ sleep 1;
+ exec 'su', 'mdk', 'startkde';
}
sub automatic_xconf {
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index ff65082d6..cc57cd587 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -296,10 +296,6 @@ sub exitInstall {
installStepsCall($o, $auto, 'exitInstall', getNextStep($::o) eq 'exitInstall');
}
-sub exitMove {
- move::exit();
-}
-
sub start_i810fb() {
my ($vga) = cat_('/proc/cmdline') =~ /vga=(\S+)/;