summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-09-06 10:37:09 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-09-06 10:37:09 +0000
commit231f5086cc1b833b8b7e2665041a22be17d9ead4 (patch)
tree6b80695ef2d7132dd3bced2d29071198bf4466f5
parentc0bf84bea00837c70ad62540e5a7b45f529e4221 (diff)
downloaddrakx-231f5086cc1b833b8b7e2665041a22be17d9ead4.tar
drakx-231f5086cc1b833b8b7e2665041a22be17d9ead4.tar.gz
drakx-231f5086cc1b833b8b7e2665041a22be17d9ead4.tar.bz2
drakx-231f5086cc1b833b8b7e2665041a22be17d9ead4.tar.xz
drakx-231f5086cc1b833b8b7e2665041a22be17d9ead4.zip
ensure Xconfig::various::various is called at install
-rw-r--r--perl-install/Xconfig/main.pm5
-rw-r--r--perl-install/Xconfig/various.pm3
2 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index f4729b6c8..d7fd47eaf 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -59,9 +59,9 @@ sub configure_everything {
if (!$ok) {
($ok) = configure_chooser_raw($in, $raw_X, $do_pkgs, $options, $X, 1);
- } else {
- Xconfig::various::various($in, $X->{card}, $options, $auto);
}
+ $X->{various} ||= Xconfig::various::various($in, $X->{card}, $options, $auto);
+
$ok = may_write($in, $raw_X, $X, $ok);
$ok && 'config_changed';
@@ -117,6 +117,7 @@ sub configure_chooser_raw {
),
{ val => _("Options"), icon => "ic82-tape-40", clicked => sub {
Xconfig::various::various($in, $X->{card}, $options);
+ $X->{various} = 'done';
} },
{ val => $::isInstall ? _("Ok") : _("Quit"), icon => "exit", clicked_may_quit => sub { 1 } },
]);
diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm
index 646edf8be..0311026d3 100644
--- a/perl-install/Xconfig/various.pm
+++ b/perl-install/Xconfig/various.pm
@@ -48,6 +48,7 @@ sub various {
tvout($in, $card, $options);
choose_xdm($in, $auto);
+ 1;
}
sub choose_xdm {
@@ -59,7 +60,7 @@ sub choose_xdm {
$xdm = $in->ask_yesorno(_("Graphical interface at startup"),
_("I can setup your computer to automatically start the graphical interface (XFree) upon booting.
-Would you like XFree to start when you reboot?"), $xdm) or return
+Would you like XFree to start when you reboot?"), $xdm) or return;
}
any::runlevel($::prefix, $xdm ? 5 : 3);
}