From 0353e0c83289dec12ce4b293c327cc5bf86de4a8 Mon Sep 17 00:00:00 2001 From: Maxim Devaev Date: Tue, 5 Apr 2022 21:33:41 +0300 Subject: [PATCH] pst remount helper --- configs/os/sudoers/v0-hdmi | 1 + configs/os/sudoers/v0-hdmiusb | 1 + configs/os/sudoers/v2-hdmi | 1 + configs/os/sudoers/v2-hdmiusb | 1 + configs/os/sudoers/v3-hdmi | 1 + configs/os/sysusers.conf | 2 ++ kvmd/helpers/remount/__init__.py | 3 +++ setup.py | 1 + 8 files changed, 11 insertions(+) create mode 100644 configs/os/sudoers/v0-hdmi create mode 100644 configs/os/sudoers/v0-hdmiusb diff --git a/configs/os/sudoers/v0-hdmi b/configs/os/sudoers/v0-hdmi new file mode 100644 index 00000000..bb549dc8 --- /dev/null +++ b/configs/os/sudoers/v0-hdmi @@ -0,0 +1 @@ +kvmd-pst ALL=(ALL) NOPASSWD: /usr/bin/kvmd-helper-pst-remount diff --git a/configs/os/sudoers/v0-hdmiusb b/configs/os/sudoers/v0-hdmiusb new file mode 100644 index 00000000..bb549dc8 --- /dev/null +++ b/configs/os/sudoers/v0-hdmiusb @@ -0,0 +1 @@ +kvmd-pst ALL=(ALL) NOPASSWD: /usr/bin/kvmd-helper-pst-remount diff --git a/configs/os/sudoers/v2-hdmi b/configs/os/sudoers/v2-hdmi index cc50dc9f..f5d7f5b3 100644 --- a/configs/os/sudoers/v2-hdmi +++ b/configs/os/sudoers/v2-hdmi @@ -1,2 +1,3 @@ kvmd ALL=(ALL) NOPASSWD: /usr/bin/kvmd-helper-otgmsd-unlock kvmd ALL=(ALL) NOPASSWD: /usr/bin/kvmd-helper-otgmsd-remount +kvmd-pst ALL=(ALL) NOPASSWD: /usr/bin/kvmd-helper-pst-remount diff --git a/configs/os/sudoers/v2-hdmiusb b/configs/os/sudoers/v2-hdmiusb index cc50dc9f..f5d7f5b3 100644 --- a/configs/os/sudoers/v2-hdmiusb +++ b/configs/os/sudoers/v2-hdmiusb @@ -1,2 +1,3 @@ kvmd ALL=(ALL) NOPASSWD: /usr/bin/kvmd-helper-otgmsd-unlock kvmd ALL=(ALL) NOPASSWD: /usr/bin/kvmd-helper-otgmsd-remount +kvmd-pst ALL=(ALL) NOPASSWD: /usr/bin/kvmd-helper-pst-remount diff --git a/configs/os/sudoers/v3-hdmi b/configs/os/sudoers/v3-hdmi index cc50dc9f..f5d7f5b3 100644 --- a/configs/os/sudoers/v3-hdmi +++ b/configs/os/sudoers/v3-hdmi @@ -1,2 +1,3 @@ kvmd ALL=(ALL) NOPASSWD: /usr/bin/kvmd-helper-otgmsd-unlock kvmd ALL=(ALL) NOPASSWD: /usr/bin/kvmd-helper-otgmsd-remount +kvmd-pst ALL=(ALL) NOPASSWD: /usr/bin/kvmd-helper-pst-remount diff --git a/configs/os/sysusers.conf b/configs/os/sysusers.conf index df4d768d..fefb84f4 100644 --- a/configs/os/sysusers.conf +++ b/configs/os/sysusers.conf @@ -1,10 +1,12 @@ g kvmd - - +g kvmd-pst - - g kvmd-ipmi - - g kvmd-vnc - - g kvmd-nginx - - g kvmd-janus - - u kvmd - "PiKVM - The main daemon" - +u kvmd-pst - "PiKVM - Persistent storage" - u kvmd-ipmi - "PiKVM - IPMI to KVMD proxy" - u kvmd-vnc - "PiKVM - VNC to KVMD/Streamer proxy" - u kvmd-nginx - "PiKVM - HTTP entrypoint" - diff --git a/kvmd/helpers/remount/__init__.py b/kvmd/helpers/remount/__init__.py index e432ca05..28872206 100644 --- a/kvmd/helpers/remount/__init__.py +++ b/kvmd/helpers/remount/__init__.py @@ -103,6 +103,9 @@ def main() -> None: if app == "kvmd-helper-otgmsd-remount": target = "otgmsd" dirs = ["images", "meta"] + elif app == "kvmd-helper-pst-remount": + target = "pst" + dirs = ["data"] else: raise SystemExit("Unknown application target") diff --git a/setup.py b/setup.py index d5546eab..c2b82b90 100755 --- a/setup.py +++ b/setup.py @@ -131,6 +131,7 @@ def main() -> None: "kvmd-watchdog = kvmd.apps.watchdog:main", "kvmd-helper-otgmsd-unlock = kvmd.helpers.unlock:main", "kvmd-helper-otgmsd-remount = kvmd.helpers.remount:main", + "kvmd-helper-pst-remount = kvmd.helpers.remount:main", ], },