tag v0.145.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.145.0 ---------------- * github: run dependabot gomod action weekly (osbuild/images#1476) * Author: Achilleas Koutsou, Reviewers: Lukáš Zapletal — Somewhere on the Internet, 2025-05-12 --- tag v0.146.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.146.0 ---------------- * Fixes for ESP partition: Make optional, set label (osbuild/images#1525) * Author: Alexander Larsson, Reviewers: Achilleas Koutsou, Brian C. Lane * Initial automotive work: custom selinux policy, separate build container for bootc, and ext4 verity (osbuild/images#1519) * Author: Alexander Larsson, Reviewers: Achilleas Koutsou, Simon de Vlieger * Update snapshots to 20250512 (osbuild/images#1515) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * disk: make auto-generated /boot 1 GiB big (osbuild/images#1499) * Author: Ondřej Budai, Reviewers: Achilleas Koutsou, Michael Vogt * distro.yaml: Clean up yamllint errors and warnings (osbuild/images#1523) * Author: Brian C. Lane, Reviewers: Michael Vogt, Simon de Vlieger * distro/rhel9: make /boot 1 GiB everywhere (osbuild/images#1498) * Author: Ondřej Budai, Reviewers: Michael Vogt, Simon de Vlieger * distro: move disk/container image types into pure YAML (COMPOSER-2533) (osbuild/images#1508) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * fedora: move all image types into pure YAML (osbuild/images#1514) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger * fsnode: fix go-1.24 errors (osbuild/images#1521) * Author: Michael Vogt, Reviewers: Ondřej Budai, Tomáš Hozza * osbuild: add JSON/YAML unmarshal to UdevRulesStageOptions (osbuild/images#1489) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * test: Run more distro tests in parallel (osbuild/images#1483) * Author: Brian C. Lane, Reviewers: Michael Vogt, Simon de Vlieger — Somewhere on the Internet, 2025-05-19 --- tag v0.147.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.147.0 ---------------- * Add support for setting partition uuid and label (osbuild/images#1543) * Author: Alexander Larsson, Reviewers: Achilleas Koutsou, Simon de Vlieger * Cleanup of new APIs (mkfs options and build container) (osbuild/images#1526) * Author: Alexander Larsson, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro/rhel: remove the user/group warnings for edge-commits (osbuild/images#1538) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Simon de Vlieger — Somewhere on the Internet, 2025-05-20 --- tag v0.148.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.148.0 ---------------- * Makefile: add vet command to check for consistent struct tags (osbuild/images#1554) * Author: Michael Vogt, Reviewers: Lukáš Zapletal, Simon de Vlieger * disk: tiny tweaks for the new MkfsOptions support (osbuild/images#1545) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Alexander Larsson, Lukáš Zapletal * fedora/many: increase `/boot` to 1 GiB (HMS-8604) (osbuild/images#1557) * Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Ondřej Budai * fedora/wsl: include `wsl-setup` (HMS-8573) (osbuild/images#1550) * Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt * fedora: add `anaconda.ModuleUsers` to ImageInstallerImage (osbuild/images#1558) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger * fedora: implement setting of the RootfsType via YAML (osbuild/images#1544) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger * rhel10: move ImageConfig into pure YAML (osbuild/images#1542) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger — Somewhere on the Internet, 2025-05-26 ---
148 lines
3.4 KiB
Go
148 lines
3.4 KiB
Go
package disk
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"math/rand"
|
|
"reflect"
|
|
|
|
"github.com/google/uuid"
|
|
)
|
|
|
|
type MkfsOption int
|
|
|
|
const ( // MkfsOption type enum
|
|
MkfsVerity MkfsOption = iota // Enable fs-verity option if needed (typically for EXT4)
|
|
)
|
|
|
|
func getMkfsOptionMapping() []string {
|
|
return []string{"verity"}
|
|
}
|
|
|
|
// String converts MkfsOption into a human readable string
|
|
func (option MkfsOption) String() string {
|
|
return getMkfsOptionMapping()[int(option)]
|
|
}
|
|
|
|
func unmarshalHelper(data []byte, mapping []string) (int, error) {
|
|
var stringInput string
|
|
err := json.Unmarshal(data, &stringInput)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
for n, str := range mapping {
|
|
if str == stringInput {
|
|
return n, nil
|
|
}
|
|
}
|
|
return 0, fmt.Errorf("invalid mkfsoption: %s", stringInput)
|
|
}
|
|
|
|
// UnmarshalJSON converts a JSON string into an MkfsOption
|
|
func (option *MkfsOption) UnmarshalJSON(data []byte) error {
|
|
val, err := unmarshalHelper(data, getMkfsOptionMapping())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
*option = MkfsOption(val)
|
|
return nil
|
|
}
|
|
|
|
func (option MkfsOption) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(getMkfsOptionMapping()[option])
|
|
}
|
|
|
|
// Filesystem related functions
|
|
type Filesystem struct {
|
|
Type string `json:"type" yaml:"type"`
|
|
|
|
// ID of the filesystem, vfat doesn't use traditional UUIDs, therefore this
|
|
// is just a string.
|
|
UUID string `json:"uuid,omitempty" yaml:"uuid,omitempty"`
|
|
Label string `json:"label,omitempty" yaml:"label,omitempty"`
|
|
Mountpoint string `json:"mountpoint,omitempty" yaml:"mountpoint,omitempty"`
|
|
// The fourth field of fstab(5); fs_mntops
|
|
FSTabOptions string `json:"fstab_options,omitempty" yaml:"fstab_options,omitempty"`
|
|
// The fifth field of fstab(5); fs_freq
|
|
FSTabFreq uint64 `json:"fstab_freq,omitempty" yaml:"fstab_freq,omitempty"`
|
|
// The sixth field of fstab(5); fs_passno
|
|
FSTabPassNo uint64 `json:"fstab_passno,omitempty" yaml:"fstab_passno,omitempty"`
|
|
// Custom mkfs options
|
|
MkfsOptions []MkfsOption `json:"mkfs_options,omitempty" yaml:"mkfs_options,omitempty"`
|
|
}
|
|
|
|
func init() {
|
|
payloadEntityMap["filesystem"] = reflect.TypeOf(Filesystem{})
|
|
}
|
|
|
|
func (fs *Filesystem) EntityName() string {
|
|
return "filesystem"
|
|
}
|
|
|
|
// Clone the filesystem structure
|
|
func (fs *Filesystem) Clone() Entity {
|
|
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,
|
|
MkfsOptions: fs.MkfsOptions,
|
|
}
|
|
}
|
|
|
|
func (fs *Filesystem) GetMountpoint() string {
|
|
if fs == nil {
|
|
return ""
|
|
}
|
|
return fs.Mountpoint
|
|
}
|
|
|
|
func (fs *Filesystem) GetFSFile() string {
|
|
return fs.GetMountpoint()
|
|
}
|
|
|
|
func (fs *Filesystem) GetFSType() string {
|
|
if fs == nil {
|
|
return ""
|
|
}
|
|
return fs.Type
|
|
}
|
|
|
|
func (fs *Filesystem) GetFSSpec() FSSpec {
|
|
if fs == nil {
|
|
return FSSpec{}
|
|
}
|
|
return FSSpec{
|
|
UUID: fs.UUID,
|
|
Label: fs.Label,
|
|
}
|
|
}
|
|
|
|
func (fs *Filesystem) GetFSTabOptions() (FSTabOptions, error) {
|
|
if fs == nil {
|
|
return FSTabOptions{}, nil
|
|
}
|
|
return FSTabOptions{
|
|
MntOps: fs.FSTabOptions,
|
|
Freq: fs.FSTabFreq,
|
|
PassNo: fs.FSTabPassNo,
|
|
}, nil
|
|
}
|
|
|
|
func (fs *Filesystem) GenUUID(rng *rand.Rand) {
|
|
if fs.Type == "vfat" && fs.UUID == "" {
|
|
// vfat has no uuids, it has "serial numbers" (volume IDs)
|
|
fs.UUID = NewVolIDFromRand(rng)
|
|
return
|
|
}
|
|
if fs.UUID == "" {
|
|
fs.UUID = uuid.Must(newRandomUUIDFromReader(rng)).String()
|
|
}
|
|
}
|