only start ntpd on non-virtual systems

virtualmin · Jul 6, 2017 · ff47246 · ff47246
1 parent 103a8a3
commit ff47246
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/Virtualmin/Config/Plugin/NTP.pm b/lib/Virtualmin/Config/Plugin/NTP.pm
@@ -39,15 +39,17 @@ sub actions {
     }
     elsif (-x "/usr/sbin/ntpdate-debian") {
       $self->logsystem("ntpdate-debian");
+      if (init::action_status("ntpd")) {
+        init::enable_at_boot("ntpd");
+      }
     }
     elsif (-x "/usr/sbin/ntpdate") {
       $self->logsystem("ntpdate");
+      if (init::action_status("ntpd")) {
+        init::enable_at_boot("ntpd");
+      }
     }
 
-    # If it's installed, and not kvm-clock, turn ntpd on.
-    if (! $clocksource eq "kvm-clock" && init::action_status("ntpd")) {
-      init::enable_at_boot("ntpd");
-    }
     $self->done(1);      # OK!
   } or do {    # catch
     $self->done(0);    # Something failed