more zeroconf fixes (zcip isn't a service, stop tmdns service if

zeroconf is disabled, check tmdns init file in prefix/etc)

1 files changed, 7 insertions, 5 deletions

diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 48b9aa86e..50f0b6612 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -446,15 +446,17 @@ sub configureNetwork2 {
             $in->do_pkgs->ensure_binary_is_installed('tmdns', 'tmdns', 'auto') if !$in->do_pkgs->is_installed('bind');
             $in->do_pkgs->ensure_binary_is_installed('zcip', 'zcip', 'auto');
             write_zeroconf("$etc/tmdns.conf", $netc->{ZEROCONF_HOSTNAME});
-            foreach (qw(tmdns zcip)) {
-                services::start_service_on_boot($_);
-                services::restart($_);
-            }
+            services::start_service_on_boot("tmdns");
+            services::restart("tmdns");
         } else {
             #- disable zeroconf
             require services;
-            -f "/etc/rc.d/init.d/$_" and services::do_not_start_service_on_boot($_) foreach qw(tmdns zcip);
+            #- write blank hostname so that drakconnect doesn't assume zeroconf is enabled
             -f "$etc/tmdns.conf" and write_zeroconf("$etc/tmdns.conf", '');
+            if (-f "$etc/rc.d/init.d/tmdns") {
+                services::stop("tmdns");
+                services::do_not_start_service_on_boot("tmdns");
+            }
         }
         any { $_->{BOOTPROTO} =~ /^(pump|bootp)$/ } values %$intf and $in->do_pkgs->install('pump');
     }