Univention Bugzilla – Attachment 8688 Details for
Bug 44144
admember.py doesn't stop samba properly
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fix_samba_stop_in_admember_setup.patch
fix_samba_stop_in_admember_setup.patch (text/plain), 1.96 KB, created by
Arvid Requate
on 2017-03-30 11:37 CEST
(
hide
)
Description:
fix_samba_stop_in_admember_setup.patch
Filename:
MIME Type:
Creator:
Arvid Requate
Created:
2017-03-30 11:37 CEST
Size:
1.96 KB
patch
obsolete
>Index: univention-lib/python/admember.py >=================================================================== >--- univention-lib/python/admember.py (Revision 78012) >+++ univention-lib/python/admember.py (Arbeitskopie) >@@ -776,21 +776,22 @@ > > > def invoke_service(service, cmd): >- if not os.path.exists('/etc/init.d/%s' % service): >+ init_script = '/etc/init.d/%s' % service >+ if not os.path.exists(init_script): > return > try: >- p1 = subprocess.Popen(["invoke-rc.d", service, cmd], >+ p1 = subprocess.Popen([init_script, cmd], > close_fds=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) > stdout, stderr = p1.communicate() > except OSError as ex: >- ud.debug(ud.MODULE, ud.ERROR, "invoke-rc.d %s %s failed: %s" % (service, cmd, ex.args[1],)) >+ ud.debug(ud.MODULE, ud.ERROR, "%s %s failed: %s" % (init_script, cmd, ex.args[1],)) > return > > if p1.returncode: >- ud.debug(ud.MODULE, ud.ERROR, "invoke-rc.d %s %s failed (%d)" % (service, cmd, p1.returncode,)) >+ ud.debug(ud.MODULE, ud.ERROR, "%s %s failed (%d)" % (init_script, cmd, p1.returncode,)) > return > >- ud.debug(ud.MODULE, ud.PROCESS, "invoke-rc.d %s %s: %s" % (service, cmd, stdout)) >+ ud.debug(ud.MODULE, ud.PROCESS, "%s %s: %s" % (init_script, cmd, stdout)) > > > def do_time_sync(ad_ip): >@@ -1118,7 +1119,7 @@ > def disable_local_samba4(): > > ud.debug(ud.MODULE, ud.PROCESS, "Disable local samba4") >- stop_service("samba4") >+ stop_service("samba") > univention.config_registry.handler_set([u'samba4/autostart=false']) > > >Index: univention-server/univention-fix-ucr-dns >=================================================================== >--- univention-server/univention-fix-ucr-dns (Revision 78012) >+++ univention-server/univention-fix-ucr-dns (Arbeitskopie) >@@ -143,7 +143,7 @@ > > > def setup_logging(): >- FORMAT = '%(asctime)-15s %(levelname)-7s %(name)-17s %(message)s' >+ FORMAT = '%(asctime)-15s %(levelname)-7s %(module)-17s %(message)s' > LEVELS = [ERROR, WARNING, INFO, DEBUG] > try: > level = LEVELS[options.verbose]
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
Actions:
View
|
Diff
Attachments on
bug 44144
:
8688
|
8689