Merge pull request #6524 from tyll/update_rc_d_disable

service module: Properly disable Debian services

library/system/service

@@ -687,7 +687,8 @@ class LinuxService(Service):
 
                 return self.execute_command("%s %s enable" % (self.enable_cmd, self.name))
             else:
-                return self.execute_command("%s -f %s remove" % (self.enable_cmd, self.name))
+                return self.execute_command("%s %s disable" % (self.enable_cmd,
+                                                               self.name))
 
         # we change argument depending on real binary used:
         # - update-rc.d and systemctl wants enable/disable