diff options
author | Tom Galloway <github@tomgalloway.co.uk> | 2013-01-10 09:15:31 +0000 |
---|---|---|
committer | Tom Galloway <github@tomgalloway.co.uk> | 2013-01-10 09:15:31 +0000 |
commit | b54a4906e67e6e35a571c754865c1a517722674f (patch) | |
tree | 5b8dcf304b5d0ffe8ba01fb2e44f4c3b10e84ce5 /modules | |
parent | 8e16374136b5d230edc1cb049f30dc4ca6e88f78 (diff) |
Fix to allow hostname to be updated on Ubuntu. This needed a change to exmachina which I've created a pull request for. I've updated Make to point to my fork of exmachina until this has been merged, when it can be reverted.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/installed/system/config.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/installed/system/config.py b/modules/installed/system/config.py index 01c4ec6..b671fcc 100644 --- a/modules/installed/system/config.py +++ b/modules/installed/system/config.py @@ -10,6 +10,7 @@ import cfg from forms import Form from model import User from util import * +import platform class Config(PagePlugin): def __init__(self, *args, **kwargs): @@ -49,7 +50,10 @@ def set_hostname(hostname): # don't persist/cache change unless it was saved successfuly sys_store = filedict_con(cfg.store_file, 'sys') sys_store['hostname'] = hostname - cfg.exmachina.initd.restart("hostname.sh") # is hostname.sh debian-only? + if platform.linux_distribution()[0]=="Ubuntu" : + cfg.exmachina.service.start("hostname") + else: + cfg.exmachina.initd.restart("hostname.sh") # is hostname.sh debian-only? except OSError, e: raise cherrypy.HTTPError(500, "Hostname restart failed: %s" % e) |