summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-03-18 23:20:05 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-03-18 23:20:05 +0000
commit96490ec40a9805f998ebf63daeba8b0e5ae55415 (patch)
tree9821fb0fe2cc82699283893b37318d1e357ea346
parent1a45bfa7ef5b36c59664474f3ee6426eb60dfbfd (diff)
downloaddrakx-net-96490ec40a9805f998ebf63daeba8b0e5ae55415.tar
drakx-net-96490ec40a9805f998ebf63daeba8b0e5ae55415.tar.gz
drakx-net-96490ec40a9805f998ebf63daeba8b0e5ae55415.tar.bz2
drakx-net-96490ec40a9805f998ebf63daeba8b0e5ae55415.tar.xz
drakx-net-96490ec40a9805f998ebf63daeba8b0e5ae55415.zip
Fixed overlapping between portmap and rpcbind.
-rw-r--r--NEWS2
-rwxr-xr-xbin/draknfs12
2 files changed, 9 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 9ceffb0..d67426d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
- draknfs:
- o installing portmap and activating required services on boot (#48913).
+ o preventing overlap of portmap and rpcbind (#48913).
- drakgw:
o better explanation for firewall configuration (#34460).
- wireless backend:
diff --git a/bin/draknfs b/bin/draknfs
index cc3d42e..aa0d8fb 100755
--- a/bin/draknfs
+++ b/bin/draknfs
@@ -34,8 +34,9 @@ use ugtk2 qw(:ask :wrappers :create :dialogs);
my $in = 'interactive'->vnew('su');
$in->do_pkgs->ensure_is_installed('nfs-utils', '/etc/rc.d/init.d/nfs-server') or exit(1);
-$in->do_pkgs->ensure_is_installed('rpcbind', '/etc/rc.d/init.d/rpcbind') or exit(1);
-$in->do_pkgs->ensure_is_installed('portmap', '/etc/rc.d/init.d/portmap') or exit(1);
+if (!$in->do_pkgs->is_installed("portmap")) {
+ $in->do_pkgs->ensure_is_installed('rpcbind') or exit(1);
+}
use constant COLUMN_DIR => 0;
use constant COLUMN_ACCESS => 1;
@@ -581,8 +582,11 @@ my $okcancel = create_okcancel({
);
my $wait = $in->wait_message(N("Please wait"), N("Starting the NFS-server"));
-services::enable('portmap');
-services::enable('rpcbind');
+if (services::service_exists("portmap")) {
+ services::enable('portmap');
+} elsif (services::service_exists("rpcbind")) {
+ services::enable('rpcbind');
+}
services::enable('nfs-server');
undef $wait;