summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/Xconfig/main.pm2
-rw-r--r--perl-install/install_any.pm1
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index 3a4b27e0d..bdb4cbfa5 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -174,7 +174,7 @@ sub configure_everything_or_configure_chooser {
$err ||= check_valid($raw_X) if $raw_X && @$raw_X; #- that's ok if config is empty
if ($err) {
log::l("ERROR: bad X config file (error: $err)");
- $in->ask_okcancel('',
+ $options->{ignore_bad_conf} or $in->ask_okcancel('',
N("Your Xorg configuration file is broken, we will ignore it.")) or return;
$raw_X = [];
}
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 244a71454..37b1f5cda 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -1843,6 +1843,7 @@ sub X_options_from_o {
{
freedriver => $o->{freedriver},
allowFB => $o->{allowFB},
+ ignore_bad_conf => $o->{isUpgrade} =~ /redhat|conectiva/,
};
}