ZFSPoolPlugin: allow nested datasets

2015-04-30 06:45:29 +02:00
parent 6d788031b0
commit 93124ef4fe
1 changed files with 6 additions and 2 deletions
--- a/PVE/Storage/ZFSPoolPlugin.pm
+++ b/PVE/Storage/ZFSPoolPlugin.pm
@ -449,8 +449,12 @@ sub activate_storage {
    my @param = ('-o', 'name', '-H');

    my $text = zfs_request($class, $scfg, undef, 'zpool_list', @param);
- 
-    if ($text !~ $scfg->{pool}) {
+
+    # Note: $scfg->{pool} can include dataset <pool>/<dataset>
+    my $pool = $scfg->{pool};
+    $pool =~ s!/.*$!!;
+
+    if ($text !~ $pool) {
 	run_command("zpool import -d /dev/disk/by-id/ -a");
    }
    return 1;