From 7e7b97bd61f59c1c5d33ed1ed72b34011cfb8a4e Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Thu, 17 Dec 2015 13:25:58 -0800 Subject: [PATCH] VM Manager: Fix: regex that captures and transposes user path --- plugins/dynamix.vm.manager/scripts/qemu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix.vm.manager/scripts/qemu.php b/plugins/dynamix.vm.manager/scripts/qemu.php index 0cb215ea0..0494c891b 100755 --- a/plugins/dynamix.vm.manager/scripts/qemu.php +++ b/plugins/dynamix.vm.manager/scripts/qemu.php @@ -11,7 +11,7 @@ if (!isset($argv[1])) { function detect_user_share(&$arg) { - $arg = preg_replace_callback('|(/mnt/user/[^, ]+)|', function($match) { + $arg = preg_replace_callback('|(/mnt/user/[^,]+\.[^, ]+)[, ]?|', function($match) { if (is_file($match[0])) { // resolve the actual disk or cache backing device for this user share path $realdisk = trim(shell_exec("getfattr --absolute-names -n user.LOCATIONS ".escapeshellarg($match[0])." 2>/dev/null|grep -Po '^user.LOCATIONS=\"\K[^\\\"]+'"));