Root filesystem must be created directly of zfs dataset due to requir…

…ements of zfs dracut module (#241)
outofforest · Jul 3, 2023 · e07c054 · e07c054
1 parent 492f39a
commit e07c054
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/infra/storage/zfs.go b/infra/storage/zfs.go
@@ -103,7 +103,7 @@ func (d *zfsDriver) BuildID(ctx context.Context, buildKey types.BuildKey) (types
 func (d *zfsDriver) CreateEmpty(ctx context.Context, imageName string, buildID types.BuildID) (FinalizeFn, string, error) {
 	buildDir := filepath.Join("/", d.config.Root, string(buildID))
 	filesystem, err := zfs.CreateFilesystem(ctx, d.config.Root+"/"+string(buildID), zfs.CreateFilesystemOptions{Properties: map[string]string{
-		"mountpoint": buildDir,
+		"mountpoint": filepath.Join(buildDir, "root"),
 		propertyName: string(must.Bytes(json.Marshal(types.BuildInfo{
 			BuildID:   buildID,
 			Name:      imageName,
@@ -142,7 +142,7 @@ func (d *zfsDriver) Clone(ctx context.Context, srcBuildID types.BuildID, dstImag
 	properties := dstBuildID.Type().Properties()
 	buildDir := filepath.Join("/", d.config.Root, string(dstBuildID))
 	filesystem, err := snapshot.Clone(ctx, d.config.Root+"/"+string(dstBuildID), zfs.CloneOptions{Properties: map[string]string{
-		"mountpoint": buildDir,
+		"mountpoint": filepath.Join(buildDir, "root"),
 		propertyName: string(must.Bytes(json.Marshal(types.BuildInfo{
 			BuildID:   dstBuildID,
 			BasedOn:   srcBuildID,