disk: move Filesystem and methods to separate file

Split up disk.go into smaller more managable pieces: continue
with moving `Filesystem` to its own file.

Co-Authored-By: Christian Kellner <christian@kellner.me>

internal/disk/disk.go

@@ -46,21 +46,6 @@ type Partition struct {
 	Filesystem *Filesystem
 }
 
-type Filesystem struct {
-	Type string
-	// ID of the filesystem, vfat doesn't use traditional UUIDs, therefore this
-	// is just a string.
-	UUID       string
-	Label      string
-	Mountpoint string
-	// The fourth field of fstab(5); fs_mntops
-	FSTabOptions string
-	// The fifth field of fstab(5); fs_freq
-	FSTabFreq uint64
-	// The sixth field of fstab(5); fs_passno
-	FSTabPassNo uint64
-}
-
 // Ensure the partition has at least the given size. Will do nothing
 // if the partition is already larger. Returns if the size changed.
 func (p *Partition) EnsureSize(s uint64) bool {
@@ -88,35 +73,6 @@ func (p *Partition) QEMUPartition() osbuild.QEMUPartition {
 	}
 }
 
-// Filesystem related functions
-
-// Clone the filesystem structure
-func (fs *Filesystem) Clone() *Filesystem {
-	if fs == nil {
-		return nil
-	}
-
-	return &Filesystem{
-		Type:         fs.Type,
-		UUID:         fs.UUID,
-		Label:        fs.Label,
-		Mountpoint:   fs.Mountpoint,
-		FSTabOptions: fs.FSTabOptions,
-		FSTabFreq:    fs.FSTabFreq,
-		FSTabPassNo:  fs.FSTabPassNo,
-	}
-}
-
-// Converts Filesystem to osbuild.QEMUFilesystem that encodes the same fs.
-func (fs *Filesystem) QEMUFilesystem() osbuild.QEMUFilesystem {
-	return osbuild.QEMUFilesystem{
-		Type:       fs.Type,
-		UUID:       fs.UUID,
-		Label:      fs.Label,
-		Mountpoint: fs.Mountpoint,
-	}
-}
-
 // uuid generator helpers
 
 // GeneratesnewRandomUUIDFromReader generates a new random UUID (version

internal/disk/filesystem.go

@@ -0,0 +1,46 @@
+package disk
+
+import osbuild "github.com/osbuild/osbuild-composer/internal/osbuild1"
+
+// Filesystem related functions
+type Filesystem struct {
+	Type string
+	// ID of the filesystem, vfat doesn't use traditional UUIDs, therefore this
+	// is just a string.
+	UUID       string
+	Label      string
+	Mountpoint string
+	// The fourth field of fstab(5); fs_mntops
+	FSTabOptions string
+	// The fifth field of fstab(5); fs_freq
+	FSTabFreq uint64
+	// The sixth field of fstab(5); fs_passno
+	FSTabPassNo uint64
+}
+
+// Clone the filesystem structure
+func (fs *Filesystem) Clone() *Filesystem {
+	if fs == nil {
+		return nil
+	}
+
+	return &Filesystem{
+		Type:         fs.Type,
+		UUID:         fs.UUID,
+		Label:        fs.Label,
+		Mountpoint:   fs.Mountpoint,
+		FSTabOptions: fs.FSTabOptions,
+		FSTabFreq:    fs.FSTabFreq,
+		FSTabPassNo:  fs.FSTabPassNo,
+	}
+}
+
+// Converts Filesystem to osbuild.QEMUFilesystem that encodes the same fs.
+func (fs *Filesystem) QEMUFilesystem() osbuild.QEMUFilesystem {
+	return osbuild.QEMUFilesystem{
+		Type:       fs.Type,
+		UUID:       fs.UUID,
+		Label:      fs.Label,
+		Mountpoint: fs.Mountpoint,
+	}
+}