summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-02-26 16:35:18 +0000
committerFrancois Pons <fpons@mandriva.com>2003-02-26 16:35:18 +0000
commit4e68dbc5a206cc1953e05a985efe9d3f922a4f14 (patch)
tree0ae1dada30e6d397302e86ba3ab4580014a440f8
parent9b7480f9412c0e2c39be72ea356b28ebe6a33d20 (diff)
downloaddrakx-4e68dbc5a206cc1953e05a985efe9d3f922a4f14.tar
drakx-4e68dbc5a206cc1953e05a985efe9d3f922a4f14.tar.gz
drakx-4e68dbc5a206cc1953e05a985efe9d3f922a4f14.tar.bz2
drakx-4e68dbc5a206cc1953e05a985efe9d3f922a4f14.tar.xz
drakx-4e68dbc5a206cc1953e05a985efe9d3f922a4f14.zip
added code to handle more smootly if apache or apache-mod_perl is installed, or
try using apache2.
-rwxr-xr-xperl-install/standalone/drakpxe2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/standalone/drakpxe b/perl-install/standalone/drakpxe
index 2489a8f05..00dd27407 100755
--- a/perl-install/standalone/drakpxe
+++ b/perl-install/standalone/drakpxe
@@ -220,7 +220,7 @@ Leave it blank if you do not want to set up automatic installation mode.
my %rpm2file = ('dhcp-server' => '/usr/sbin/dhcpd',
'pxe' => '/usr/sbin/pxe',
'tftp-server' => '/usr/sbin/in.tftpd',
- 'apache2' => '/usr/sbin/httpd2');
+ if_(! -x '/usr/sbin/httpd' && ! -x '/usr/sbin/httpd-perl', 'apache2' => '/usr/sbin/httpd2'));
#- first: try to install all in one step
my @needed_to_install = grep { !-e $rpm2file{$_} } keys %rpm2file;