Skip to content

Commit

Permalink
#3431982 - autoshutdown configuration not propagate in local_conf.py
Browse files Browse the repository at this point in the history
git-svn-id: svn://svn.freevo.org/freevo/branches/rel-1/freevo@11901 cc3e1ea1-1e01-0410-8d68-8b121e83a9d5
  • Loading branch information
charrea6 committed Nov 8, 2011
1 parent 5fc4304 commit f11d42a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 2 additions & 0 deletions freevo_config.py
Expand Up @@ -751,6 +751,8 @@
# Use udisks to find removable storage
plugin.activate('udisks')

AUTOSHUTDOWN_PROCESS_LIST = ['mencoder','transcode','cdrecord','emerge','tvgids.sh','tv_grab','sshd:']

# Set to true to allow destination to be clobbered
SHOPPINGCART_CLOBBER = False

Expand Down
3 changes: 1 addition & 2 deletions src/plugins/autoshutdown.py
Expand Up @@ -246,7 +246,6 @@ class PluginInterface(plugin.MainMenuPlugin):
"""

def config(self):
PLIST = ['mencoder','transcode','cdrecord','emerge','tvgids.sh','tv_grab','sshd:']
return [
('SYS_SHUTDOWN_ENABLE', 1, 'enable system shutdown'),
('SYS_SHUTDOWN_CMD', 'sudo shutdown -h now', 'shutdown command'),
Expand All @@ -259,7 +258,7 @@ def config(self):
('AUTOSHUTDOWN_WAKEUP_TIME_PAD', 180, 'seconds to start ahead of time set'),
('AUTOSHUTDOWN_ALLOWED_IDLE_TIME', 45, 'minutes of idle time allowed'),
('AUTOSHUTDOWN_WHILE_USER_LOGGED', True, 'shutdown even when someone is logged in'),
('AUTOSHUTDOWN_PROCESS_LIST', PLIST, 'list of processes that prevent a shutdown'),
('AUTOSHUTDOWN_PROCESS_LIST', [], 'list of processes that prevent a shutdown'),
('AUTOSHUTDOWN_PROCESS_CHECK', '/home/user/bin/freevoshutdown_check',
'command to check external processes before shutdown'),
('AUTOSHUTDOWN_METHOD', None, 'acpi or nvram (or None to disable)'),
Expand Down

0 comments on commit f11d42a

Please sign in to comment.