Fix support for target that is mounted as a subvolume by ignoring extra mount options

Author: nazar-pc

changelog.md

@@ -1,3 +1,7 @@
+# 0.10.0 (07 October, 2023)
+* Fix warning generated during normal operation
+* Fix support for target that is mounted as a subvolume by ignoring extra mount options
+
 # 0.9 (17 March, 2017)
 * Added `/sbin/btrfs` to the list of checked binary locations (used on Gentoo)
 

just-backup-btrfs

@@ -8,9 +8,9 @@ use
 /**
  * @package   Just backup btrfs
  * @author    Nazar Mokrynskyi <[email protected]>
- * @copyright Copyright (c) 2014-2017, Nazar Mokrynskyi
+ * @copyright Copyright (c) 2014-2023, Nazar Mokrynskyi
  * @license   http://opensource.org/licenses/MIT
- * @version   0.9
+ * @version   0.10.0
  */
 class Just_backup_btrfs {
 	/**
@@ -217,6 +217,23 @@ class Just_backup_btrfs {
 		}
 		list($partition, $mount_point, $mount_options) = $mount_point_options;
 
+		/**
+		 * Remove subvolume options, we'll be mounting root instead
+		 */
+		$mount_options = implode(
+			",",
+			array_filter(explode(",", $mount_options), function ($option) {
+				if (strpos($option, "subvolid=") === 0) {
+					return false;
+				}
+				if (strpos($option, "subvol=") === 0) {
+					return false;
+				}
+
+				return true;
+			})
+		);
+
 		/**
 		 * Set fixed destination as path inside subvolume, just remove mount point from the whole destination path
 		 */