From e57efeeca3bfdecb420eff2352e366accedfd4a7 Mon Sep 17 00:00:00 2001
From: Martin Pitt <mpitt@redhat.com>
Date: Fri, 10 Jan 2025 14:27:09 +0100
Subject: [PATCH] storaged: Move /var/lib/cockpit/btrfs to /run

This shouldn't be on persistent storage -- after a reboot all the mounts
are gone, so the database should not survive that either.

Use `os.path.join()` for a slightly more regular and cleaner path
building.

Opportunistically clean up the /var dir on package upgrades, in a
careful way that will keep any existing leaked mounts there. This may
interfere with running remote sessions (without upgrading cockpit-ws),
so they will treat the /var mounts as custom external ones for the rest
of their lives. That's acceptable, though.
---
 pkg/storaged/btrfs/btrfs-tool.py      | 10 +++++-----
 pkg/storaged/utils.js                 |  2 +-
 tools/cockpit.spec                    |  7 +++++++
 tools/debian/cockpit-storage.postinst |  9 +++++++++
 4 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 tools/debian/cockpit-storage.postinst

diff --git a/pkg/storaged/btrfs/btrfs-tool.py b/pkg/storaged/btrfs/btrfs-tool.py
index 1ddf96d17aa7..4db37700fcaf 100755
--- a/pkg/storaged/btrfs/btrfs-tool.py
+++ b/pkg/storaged/btrfs/btrfs-tool.py
@@ -33,7 +33,7 @@ def debug(msg):
     pass
 
 
-TMP_MP_DIR = "/var/lib/cockpit/btrfs"
+TMP_MP_DIR = "/run/cockpit/btrfs"
 
 
 def read_all(fd):
@@ -106,7 +106,7 @@ def add_tmp_mountpoint(db, fs, dev, opt_repair):
         else:
             db[uuid] = 1
         if not fs['has_tmp_mountpoint'] and (db[uuid] == 1 or opt_repair):
-            path = TMP_MP_DIR + "/" + uuid
+            path = os.path.join(TMP_MP_DIR, uuid)
             debug(f"MOUNTING {path}")
             os.makedirs(path, exist_ok=True)
             subprocess.check_call(["mount", dev, path])
@@ -118,7 +118,7 @@ def remove_tmp_mountpoint(db, uuid):
         debug(f"REMOVING {uuid}")
         tmp_mountpoints.remove(uuid)
         if db[uuid] == 1:
-            path = TMP_MP_DIR + "/" + uuid
+            path = os.path.join(TMP_MP_DIR, uuid)
             try:
                 debug(f"UNMOUNTING {path}")
                 subprocess.check_call(["umount", path])
@@ -139,7 +139,7 @@ def remove_all_tmp_mountpoints():
 
 def force_mount_point(db, fs, opt_repair):
     add_tmp_mountpoint(db, fs, fs['devices'][0], opt_repair)
-    return TMP_MP_DIR + "/" + fs['uuid']
+    return os.path.join(TMP_MP_DIR, fs['uuid'])
 
 
 def get_mount_point(db, fs, opt_mount, opt_repair):
@@ -251,7 +251,7 @@ def cmd_do(uuid, cmd):
     filesystems = list_filesystems()
     for fs in filesystems.values():
         if fs['uuid'] == uuid:
-            path = "/run/cockpit/btrfs"
+            path = TMP_MP_DIR
             dev = fs['devices'][0]
             os.makedirs(path, mode=0o700, exist_ok=True)
             unshare_mounts()
diff --git a/pkg/storaged/utils.js b/pkg/storaged/utils.js
index 8ba5558ca9d0..c86ed8e37e21 100644
--- a/pkg/storaged/utils.js
+++ b/pkg/storaged/utils.js
@@ -25,7 +25,7 @@ import * as timeformat from "timeformat";
 const _ = cockpit.gettext;
 const C_ = cockpit.gettext;
 
-export const BTRFS_TOOL_MOUNT_PATH = "/var/lib/cockpit/btrfs/";
+export const BTRFS_TOOL_MOUNT_PATH = "/run/cockpit/btrfs/";
 
 /* UTILITIES
  */
diff --git a/tools/cockpit.spec b/tools/cockpit.spec
index 6883ea1c0136..f87a17b08549 100644
--- a/tools/cockpit.spec
+++ b/tools/cockpit.spec
@@ -546,6 +546,13 @@ The Cockpit component for managing storage.  This package uses udisks.
 %files -n cockpit-storaged -f storaged.list
 %{_datadir}/metainfo/org.cockpit_project.cockpit_storaged.metainfo.xml
 
+%post storaged
+
+# version 332 moved the btrfs temp mounts db to /run
+if [ "$1" = 2 ] && [ -d /var/lib/cockpit/btrfs ]; then
+    rm -rf --one-file-system  /var/lib/cockpit/btrfs || true
+fi
+
 %package -n cockpit-packagekit
 Summary: Cockpit user interface for packages
 BuildArch: noarch
diff --git a/tools/debian/cockpit-storage.postinst b/tools/debian/cockpit-storage.postinst
new file mode 100644
index 000000000000..2a64e6b924ab
--- /dev/null
+++ b/tools/debian/cockpit-storage.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
+
+# version 332 moved the btrfs temp mounts db to /run
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt-nl 322 && [ -d /var/lib/cockpit/btrfs ]; then
+   rm -rf --one-file-system  /var/lib/cockpit/btrfs || true
+fi