diff --git a/Makefile b/Makefile index 46f88d8..c4b6539 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SPK_NAME = rr-manager SPK_VERS = 2.0 -SPK_REV = 48 +SPK_REV = 49 SPK_ICON = src/rr-manager.png DSM_UI_DIR = ui diff --git a/src/conf/resource b/src/conf/resource index 440f81a..895ef25 100644 --- a/src/conf/resource +++ b/src/conf/resource @@ -52,17 +52,17 @@ ], "link-name": "RRManager", "type": "cgi" - } + } ] }, "indexdb": { "app-index": { - "conf-relpath": "ui/index.conf", - "db-relpath": "indexdb/appindexdb" + "conf-relpath": "ui/index.conf", + "db-relpath": "indexdb/appindexdb" }, "help-index": { - "conf-relpath": "ui/helptoc.conf", - "db-relpath": "indexdb/helpindexdb" + "conf-relpath": "ui/helptoc.conf", + "db-relpath": "indexdb/helpindexdb" } -}, + } } \ No newline at end of file diff --git a/src/ui/install.sh b/src/ui/install.sh index 072a01a..d49f7e2 100644 --- a/src/ui/install.sh +++ b/src/ui/install.sh @@ -8,4 +8,7 @@ mv /var/packages/rr-manager/conf/privilege_ /var/packages/rr-manager/conf/privil sed -i ''s/package/root/g'' /var/packages/rr-manager/conf/privilege synopkg restart rr-manager cat /var/packages/rr-manager/target/ui/tasks.sql | sqlite3 /usr/syno/etc/esynoscheduler/esynoscheduler.db -echo "DELETE FROM task WHERE task_name='SetRootPrivsToRrManager'" | sqlite3 /usr/syno/etc/esynoscheduler/esynoscheduler.db \ No newline at end of file +echo "DELETE FROM task WHERE task_name='SetRootPrivsToRrManager'" | sqlite3 /usr/syno/etc/esynoscheduler/esynoscheduler.db +#Add sudoers for loader disk +echo -e "sc-rr-manager ALL=(ALL) NOPASSWD: /usr/bin/rr-loaderdisk.sh mountLoaderDisk\nsc-rr-manager ALL=(ALL) NOPASSWD: /usr/bin/rr-loaderdisk.sh unmountLoaderDisk" | tee /etc/sudoers.d/99-rr-loaderdisk /etc.defaults/sudoers.d/99-rr-loaderdisk > /dev/null +chmod 0440 /etc/sudoers.d/99-rr-loaderdisk /etc.defaults/sudoers.d/99-rr-loaderdisk diff --git a/src/webapi/getAddons.cgi b/src/webapi/getAddons.cgi index bbcf40b..ba4af46 100644 --- a/src/webapi/getAddons.cgi +++ b/src/webapi/getAddons.cgi @@ -65,7 +65,7 @@ ADDONS_PATH = '/mnt/p3/addons/' response = {} def callMountLoaderScript(action): - process = subprocess.run(['/usr/bin/rr-loaderdisk.sh', action], + process = subprocess.run(['sudo','/usr/bin/rr-loaderdisk.sh', action], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) def mountLoader(): diff --git a/src/webapi/getConfig.cgi b/src/webapi/getConfig.cgi index 020b7cc..e91f91c 100644 --- a/src/webapi/getConfig.cgi +++ b/src/webapi/getConfig.cgi @@ -65,7 +65,7 @@ def read_rr_awaiting_update(fileName): return "healthy" def callMountLoaderScript(action): - process = subprocess.run(['/usr/bin/rr-loaderdisk.sh', action], + process = subprocess.run(['sudo','/usr/bin/rr-loaderdisk.sh', action], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)