Skip to content

Commit

Permalink
[NetworkSetup] Adopt for Samba being a pure daemon
Browse files Browse the repository at this point in the history
... again
Start/stop no longer required when enabling/disabling autostart.
  • Loading branch information
Schimmelreiter committed May 10, 2015
1 parent faa7bb4 commit 87d3673
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions lib/python/Screens/NetworkSetup.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -2549,10 +2549,8 @@ def StartStopCallback(self, result = None, retval = None, extra_args = None):
def activateSamba(self):
commands = []
if fileExists('/etc/rc2.d/S20samba'):
commands.append('/etc/init.d/samba stop')
commands.append('update-rc.d -f samba remove')
else:
commands.append('/etc/init.d/samba start')
commands.append('update-rc.d -f samba defaults')
self.Console.eBatch(commands, self.StartStopCallback, debug=True)

Expand All @@ -2572,13 +2570,6 @@ def updateService(self):
self.my_Samba_run = False
if samba_process:
self.my_Samba_run = True
if fileExists('/etc/inetd.conf'):
f = open('/etc/inetd.conf', 'r')
for line in f.readlines():
parts = line.strip().split()
if parts[0] == 'microsoft-ds':
self.my_Samba_run = True
continue
if self.my_Samba_run:
self['labstop'].hide()
self['labactive'].show()
Expand Down

0 comments on commit 87d3673

Please sign in to comment.