nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

snapshots: Fix for permissions issue when updating configuration

Browse Source 
- Change `configure` command to `set-config` for consistency with `get-config`
- Run `set-config` as superuser

Fixes freedombox-team/plinth#1290

Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Joseph Nuthalapati 2018-04-09 16:13:23 +05:30 committed by James Valleroy
parent 41641491bb
commit 8416c0831d
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actions/snapshot
View File

@ -47,7 +47,7 @@ def parse_arguments():
subparser = subparsers.add_parser('delete-all', subparser = subparsers.add_parser('delete-all',
help='Delete all the snapshots') help='Delete all the snapshots')
subparser = subparsers.add_parser('configure', subparser = subparsers.add_parser('set-config',
help='Configure automatic snapshots') help='Configure automatic snapshots')
subparser.add_argument('config') subparser.add_argument('config')
@ -196,7 +196,7 @@ def _get_delete_arg(range_list):
return range_list[0] + '-' + range_list[-1] return range_list[0] + '-' + range_list[-1]
def subcommand_configure(arguments): def subcommand_set_config(arguments):
command = ['snapper', 'set-config', arguments.config] command = ['snapper', 'set-config', arguments.config]
subprocess.run(command, check=True) subprocess.run(command, check=True)

5
plinth/modules/snapshot/views.py
View File

@ -19,7 +19,6 @@ Views for snapshot module.
""" """
import json import json
import subprocess
from django.contrib import messages from django.contrib import messages
from django.shortcuts import redirect from django.shortcuts import redirect
@ -109,10 +108,8 @@ def update_configuration(request, old_status, new_status):
('number_min_age', 'NUMBER_MIN_AGE={}'), ('number_min_age', 'NUMBER_MIN_AGE={}'),
])) ]))
command = ['snapper', 'set-config'] + list(config)
try: try:
subprocess.run(command, check=True) actions.superuser_run('snapshot', ['set-config', " ".join(config)])
messages.success(request, _('Storage snapshots configuration updated')) messages.success(request, _('Storage snapshots configuration updated'))
except ActionError as exception: except ActionError as exception: