NAS-134555: Remove ability to set zvol as a container disk

truenas · Mar 4, 2025 · 81834c2 · 81834c2
1 parent d677c5a
commit 81834c2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/...tances/instance-details/instance-disks/instance-disk-form/instance-disk-form.component.ts b/...tances/instance-details/instance-disks/instance-disk-form/instance-disk-form.component.ts
@@ -56,7 +56,7 @@ export class InstanceDiskFormComponent implements OnInit {
       return this.filesystem.getFilesystemNodeProvider({ zvolsOnly: true });
     }
 
-    return this.filesystem.getFilesystemNodeProvider({ datasetsAndZvols: true });
+    return this.filesystem.getFilesystemNodeProvider({ datasetsOnly: true });
   });
 
   protected form = this.formBuilder.nonNullable.group({

diff --git a/src/app/pages/instances/components/instance-wizard/instance-wizard.component.ts b/src/app/pages/instances/components/instance-wizard/instance-wizard.component.ts
@@ -206,9 +206,7 @@ export class InstanceWizardComponent {
   protected readonly isVm = computed(() => this.instanceType() === VirtualizationType.Vm);
 
   readonly directoryNodeProvider = computed(() => {
-    const providerOptions = this.isVm()
-      ? { zvolsOnly: true }
-      : { datasetsAndZvols: true };
+    const providerOptions = this.isVm() ? { zvolsOnly: true } : { datasetsOnly: true };
 
     return this.filesystem.getFilesystemNodeProvider(providerOptions);
   });

diff --git a/src/app/services/filesystem.service.ts b/src/app/services/filesystem.service.ts
@@ -18,6 +18,7 @@ export interface ProviderOptions {
   includeSnapshots?: boolean;
   datasetsAndZvols?: boolean;
   zvolsOnly?: boolean;
+  datasetsOnly?: boolean;
 }
 
 const roolZvolNode = {
@@ -50,6 +51,7 @@ export class FilesystemService {
       includeSnapshots: true,
       datasetsAndZvols: false,
       zvolsOnly: false,
+      datasetsOnly: false,
       ...providerOptions,
     };
 
@@ -60,6 +62,9 @@ export class FilesystemService {
       if (options.zvolsOnly && node.data.path.trim() === '/') {
         return of([roolZvolNode]);
       }
+      if (options.datasetsOnly && node.data.path.trim() === '/') {
+        return of([roolDatasetNode]);
+      }
       const typeFilter: [QueryFilter<FileRecord>?] = [];
       if (options.directoriesOnly) {
         typeFilter.push(['type', '=', FileType.Directory]);