summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-07 13:39:35 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-07 13:39:35 +0000
commite91e26d4472559de01d75b5f94aecb4b8bf5965f (patch)
treeab8e081a721b61ca7a6b5ba53b4de2890bc8740d
parent39c77cd834b75e2d7e0d6409fc433b08ea7f81bc (diff)
downloaddrakx-backup-do-not-use-e91e26d4472559de01d75b5f94aecb4b8bf5965f.tar
drakx-backup-do-not-use-e91e26d4472559de01d75b5f94aecb4b8bf5965f.tar.gz
drakx-backup-do-not-use-e91e26d4472559de01d75b5f94aecb4b8bf5965f.tar.bz2
drakx-backup-do-not-use-e91e26d4472559de01d75b5f94aecb4b8bf5965f.tar.xz
drakx-backup-do-not-use-e91e26d4472559de01d75b5f94aecb4b8bf5965f.zip
(setPackages) skip media screen in auto install
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/any.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index fbb31eabd..93407774c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- skip media screen in auto install
+
Version 15.1 - 7 December 2012
- add basic support for grub2 (mga#416)
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 0ce8d5533..58afe29a0 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -417,7 +417,7 @@ sub setPackages {
}
install::pkgs::start_pushing_error();
- media_screen($o);
+ media_screen($o) if !$::auto_install;
# actually read synthesis now we have all the ones we want:
require urpm::media;