summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-10-31 15:26:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-10-31 15:26:41 +0000
commit7e6048a6263048b27697f3c2c3de3e8fac0deff7 (patch)
tree31ca558e425a18caa9976524a50f877dc6e01272
parent1a660ead347955fd33cf22178ed475e1ffe8e080 (diff)
downloaddrakx-7e6048a6263048b27697f3c2c3de3e8fac0deff7.tar
drakx-7e6048a6263048b27697f3c2c3de3e8fac0deff7.tar.gz
drakx-7e6048a6263048b27697f3c2c3de3e8fac0deff7.tar.bz2
drakx-7e6048a6263048b27697f3c2c3de3e8fac0deff7.tar.xz
drakx-7e6048a6263048b27697f3c2c3de3e8fac0deff7.zip
allow user=xxx on /proc/cmdline to skip ask_user name
-rw-r--r--move/move.pm10
1 files changed, 7 insertions, 3 deletions
diff --git a/move/move.pm b/move/move.pm
index 5ef8282c6..3d4f5e905 100644
--- a/move/move.pm
+++ b/move/move.pm
@@ -61,9 +61,13 @@ drakx_stuff:
sub install2::startMove {
my $o = $::o;
- require any;
- any::ask_user_one($o, $o->{users} ||= [], $o->{security},
- additional_msg => N("BLA BLA user for move, password for screensaver"), noaccept => 1, needauser => 1, noicons => 1);
+ if (cat_('/proc/cmdline') =~ /\buser=(\w+)/) {
+ $o->{users} = [ { name => $1 } ];
+ } else {
+ require any;
+ any::ask_user_one($o, $o->{users} ||= [], $o->{security},
+ additional_msg => N("BLA BLA user for move, password for screensaver"), noaccept => 1, needauser => 1, noicons => 1);
+ }
require install_steps;
install_steps::addUser($o);