Attachment 3858 Details for Bug 9875 – make installing xdm automatic if step isn't interactive

[patch] make installing xdm automatic if step isn't interactive

9875.diff (text/plain), 1.42 KB, created by Thierry Vignaud on 2013-05-01 05:13:54 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2013-05-01 05:13:54 CEST

Size: 1.42 KB

patch

obsolete

>diff --git a/perl-install/any.pm b/perl-install/any.pm
>index eb7b86e..33afd17 100644
>--- a/perl-install/any.pm
>+++ b/perl-install/any.pm
>@@ -705,15 +705,15 @@ sub is_standalone_autologin_needed {
> }
> 
> sub set_autologin {
>-    my ($do_pkgs, $autologin) = @_;
>+    my ($do_pkgs, $autologin, $o_auto) = @_;
>     log::l("set_autologin $autologin->{user} $autologin->{desktop}");
>     my $do_autologin = bool2text($autologin->{user});
> 
>     $autologin->{dm} ||= 'xdm';
>-    $do_pkgs->ensure_is_installed($autologin->{dm})
>+    $do_pkgs->ensure_is_installed($autologin->{dm}, undef, $o_auto)
>       or return;
>     if ($autologin->{user} && is_standalone_autologin_needed($autologin->{dm})) {
>-        $do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin')
>+        $do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin', $o_auto)
>           or return;
>     }
> 
>diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
>index 54f3226..c1c4d44 100644
>--- a/perl-install/install/steps.pm
>+++ b/perl-install/install/steps.pm
>@@ -745,7 +745,7 @@ sub addUser {
>         $autologin->{user} = $o->{autologin};
>         $autologin->{desktop} = $o->{desktop} if $o->{desktop};
>         $autologin->{dm} = $o->{dm} if $o->{dm};
>-        any::set_autologin($o->do_pkgs, $autologin);
>+        any::set_autologin($o->do_pkgs, $autologin, $o->{step}{auto});
>     }
> 
>     install::any::disable_user_view() if @$users == ();

diff --git a/perl-install/any.pm b/perl-install/any.pm
index eb7b86e..33afd17 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -705,15 +705,15 @@ sub is_standalone_autologin_needed {
 }
 
 sub set_autologin {
-    my ($do_pkgs, $autologin) = @_;
+    my ($do_pkgs, $autologin, $o_auto) = @_;
     log::l("set_autologin $autologin->{user} $autologin->{desktop}");
     my $do_autologin = bool2text($autologin->{user});
 
     $autologin->{dm} ||= 'xdm';
-    $do_pkgs->ensure_is_installed($autologin->{dm})
+    $do_pkgs->ensure_is_installed($autologin->{dm}, undef, $o_auto)
       or return;
     if ($autologin->{user} && is_standalone_autologin_needed($autologin->{dm})) {
-        $do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin')
+        $do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin', $o_auto)
           or return;
     }
 
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 54f3226..c1c4d44 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -745,7 +745,7 @@ sub addUser {
         $autologin->{user} = $o->{autologin};
         $autologin->{desktop} = $o->{desktop} if $o->{desktop};
         $autologin->{dm} = $o->{dm} if $o->{dm};
-        any::set_autologin($o->do_pkgs, $autologin);
+        any::set_autologin($o->do_pkgs, $autologin, $o->{step}{auto});
     }
 
     install::any::disable_user_view() if @$users == ();

Actions: View | Diff

Attachments on bug 9875: 3848 | 3858 | 3859