kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-09-03 01:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Also install fonts when installing grub (#144)

Browse Source
This commit is contained in:
Itxaka
2023-09-13 11:07:28 +02:00
committed by GitHub
parent 0afdf76278
commit 274701a3ac
3 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/constants/constants.go
View File

@@ -41,7 +41,6 @@ const (
PersistentPartName = "persistent"
OEMLabel = "COS_OEM"
OEMPartName = "oem"
ISOLabel = "COS_LIVE"
MountBinary = "/usr/bin/mount"
EfiDevice = "/sys/firmware/efi"
LinuxFs = "ext4"
@@ -50,8 +49,6 @@ const (
EfiFs = "vfat"
EfiSize = uint(64)
OEMSize = uint(64)
StateSize = uint(15360)
RecoverySize = uint(8192)
PersistentSize = uint(0)
BiosSize = uint(1)
ImgSize = uint(3072)
@@ -66,7 +63,6 @@ const (
EfiDir = "/run/cos/efi"
RecoverySquashFile = "recovery.squashfs"
IsoRootFile = "rootfs.squashfs"
IsoEFIPath = "/boot/uefi.img"
ActiveImgFile = "active.img"
PassiveImgFile = "passive.img"
RecoveryImgFile = "recovery.img"
@@ -80,8 +76,6 @@ const (
AfterUpgradeChrootHook = "after-upgrade-chroot"
AfterUpgradeHook = "after-upgrade"
BeforeUpgradeHook = "before-upgrade"
LuetDefaultRepoURI = "quay.io/costoolkit/releases-green"
LuetDefaultRepoPrio = 90
TransitionImgFile = "transition.img"
RunningStateDir = "/run/initramfs/cos-state" // TODO: converge this constant with StateDir/RecoveryDir in dracut module from cos-toolkit
RunningRecoveryStateDir = "/run/initramfs/isoscan" // TODO: converge this constant with StateDir/RecoveryDir in dracut module from cos-toolkit
@@ -89,7 +83,6 @@ const (
PassiveImgName = "passive"
RecoveryImgName = "recovery"
GPT = "gpt"
BuildImgName = "elemental"
UsrLocalPath = "/usr/local"
OEMPath = "/oem"
@@ -98,10 +91,6 @@ const (
SELinuxTargetedContextFile = SELinuxTargetedPath + "/contexts/files/file_contexts"
SELinuxTargetedPolicyPath = SELinuxTargetedPath + "/policy"
// These paths are arbitrary but coupled to grub.cfg
IsoKernelPath = "/boot/kernel"
IsoInitrdPath = "/boot/initrd"
// Default directory and file fileModes
DirPerm = os.ModeDir | os.ModePerm
FilePerm = 0666
@@ -132,15 +121,6 @@ func GetDefaultSquashfsCompressionOptions() []string {
return []string{"-comp", "gzip"}
}
func GetBuildDiskDefaultPackages() map[string]string {
return map[string]string{
"channel:system/grub2-efi-image": "efi",
"channel:system/grub2-config": "root",
"channel:system/grub2-artifacts": "root/grub2",
"channel:recovery/cos-img": "root/cOS",
}
}
func GetGrubFilePaths(arch string) []string {
var archPath string
switch arch {
@@ -163,3 +143,13 @@ func GetFallBackEfi(arch string) string {
return "bootx64.efi"
}
}
// GetGrubFonts returns the default font files for grub
func GetGrubFonts() []string {
return []string{"ascii.pf2", "euro.pf2", "unicode.pf2"}
}
// GetGrubModules returns the default module files for grub
func GetGrubModules() []string {
return []string{"loopback.mod", "squash4.mod", "xzio.mod", "gzio.mod"}
}