summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-01-10 11:36:00 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-01-10 11:36:00 +0000
commit2ca1cc678a454a9f0e4709d836179c771779ec18 (patch)
treeef62d0f414fb9d6f2720b4d51879482814c4f7cb
parent3c6be3d1a01062afc02d37d9a79afb7aa3363ec5 (diff)
downloaddrakx-2ca1cc678a454a9f0e4709d836179c771779ec18.tar
drakx-2ca1cc678a454a9f0e4709d836179c771779ec18.tar.gz
drakx-2ca1cc678a454a9f0e4709d836179c771779ec18.tar.bz2
drakx-2ca1cc678a454a9f0e4709d836179c771779ec18.tar.xz
drakx-2ca1cc678a454a9f0e4709d836179c771779ec18.zip
Silent install of terminal-server if needed (--X is deprecated)
-rwxr-xr-xperl-install/standalone/drakTermServ6
1 files changed, 1 insertions, 5 deletions
diff --git a/perl-install/standalone/drakTermServ b/perl-install/standalone/drakTermServ
index ec6a3bf96..f3633f9b2 100755
--- a/perl-install/standalone/drakTermServ
+++ b/perl-install/standalone/drakTermServ
@@ -68,11 +68,7 @@ my $cmd_line = 1;
#- make sure terminal server and friends are installed
my $ts = system("rpm -q terminal-server > /dev/null");
if ($ts == 256) {
- if ($ENV{DISPLAY}) {
- system("urpmi --X terminal-server > /dev/null");
- } else {
- system("urpmi terminal-server > /dev/null");
- }
+ system("urpmi --auto terminal-server >/dev/null 2>/dev/null") unless $::testing;
$ts = system("rpm -q terminal-server > /dev/null");
if ($ts == 256 && !$::testing) {
warn(N("Useless without Terminal Server"));