diff options
| -rw-r--r-- | move/move.pm | 13 | ||||
| -rw-r--r-- | perl-install/install2.pm | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/move/move.pm b/move/move.pm index d10e46822..12c14b7a0 100644 --- a/move/move.pm +++ b/move/move.pm @@ -16,6 +16,7 @@ my @ALLOWED_LANGS = qw(en_US fr es it de); #- were not necessary to start stage2 itself (there were setup #- by stage1 of course) sub init { + my ($o) = @_; #- rw things mkdir "/$_" foreach qw(home mnt root etc var); mkdir_p "/var/$_" foreach qw(log run/console spool lib/xkb lock/subsys); @@ -43,10 +44,22 @@ sub init { run_program::run('/sbin/devfsd', '/dev'); modules::load_category('multimedia/sound'); + + $o->{steps}{exitMove} = { reachable => 1 }; + $o->{orderedSteps} = qw(selectLanguage acceptLicense selectMouse selectKeyboard exitMove); member($_, @ALLOWED_LANGS) or delete $lang::langs{$_} foreach keys %lang::langs; } +sub exit() { + 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'); +} sub automatic_xconf { my ($o) = @_; diff --git a/perl-install/install2.pm b/perl-install/install2.pm index ed179a6ec..ff65082d6 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -296,6 +296,9 @@ sub exitInstall { installStepsCall($o, $auto, 'exitInstall', getNextStep($::o) eq 'exitInstall'); } +sub exitMove { + move::exit(); +} sub start_i810fb() { @@ -424,7 +427,7 @@ sub main { if ($::move) { require move; - move::init(); + move::init($o); } $o->{prefix} = $::prefix = $::testing ? "/tmp/test-perl-install" : $::live || $::move ? "" : "/mnt"; |