This commit is contained in:
@@ -7,30 +7,30 @@ import (
|
||||
)
|
||||
|
||||
type InstallConfig struct {
|
||||
Disk string
|
||||
EnableLUKS bool
|
||||
Hostname string
|
||||
Username string
|
||||
RootPassword string
|
||||
UserPassword string
|
||||
Timezone string
|
||||
Locale string
|
||||
Disk string
|
||||
EnableLUKS bool
|
||||
Hostname string
|
||||
Username string
|
||||
RootPassword string
|
||||
UserPassword string
|
||||
Timezone string
|
||||
Locale string
|
||||
}
|
||||
|
||||
type ArchInstallConfig struct {
|
||||
Version string `json:"version"`
|
||||
Script string `json:"script"`
|
||||
ArchinstallLanguage string `json:"archinstall-language"`
|
||||
Bootloader string `json:"bootloader"`
|
||||
Kernels []string `json:"kernels"`
|
||||
Hostname string `json:"hostname"`
|
||||
Timezone string `json:"timezone"`
|
||||
LocaleConfig LocaleConfig `json:"locale_config"`
|
||||
DiskConfig DiskConfig `json:"disk_config"`
|
||||
ProfileConfig ProfileConfig `json:"profile_config"`
|
||||
AuthConfig AuthConfig `json:"auth_config"`
|
||||
Packages []string `json:"packages"`
|
||||
Services []string `json:"services"`
|
||||
Version string `json:"version"`
|
||||
Script string `json:"script"`
|
||||
ArchinstallLanguage string `json:"archinstall-language"`
|
||||
Bootloader string `json:"bootloader"`
|
||||
Kernels []string `json:"kernels"`
|
||||
Hostname string `json:"hostname"`
|
||||
Timezone string `json:"timezone"`
|
||||
LocaleConfig LocaleConfig `json:"locale_config"`
|
||||
DiskConfig DiskConfig `json:"disk_config"`
|
||||
ProfileConfig ProfileConfig `json:"profile_config"`
|
||||
AuthConfig AuthConfig `json:"auth_config"`
|
||||
Packages []string `json:"packages"`
|
||||
Services []string `json:"services"`
|
||||
}
|
||||
|
||||
type LocaleConfig struct {
|
||||
@@ -40,14 +40,14 @@ type LocaleConfig struct {
|
||||
}
|
||||
|
||||
type DiskConfig struct {
|
||||
ConfigType string `json:"config_type"`
|
||||
ConfigType string `json:"config_type"`
|
||||
DeviceModifications []DeviceModification `json:"device_modifications"`
|
||||
}
|
||||
|
||||
type DeviceModification struct {
|
||||
Device string `json:"device"`
|
||||
Partitions []Partition `json:"partitions"`
|
||||
Wipe bool `json:"wipe"`
|
||||
Device string `json:"device"`
|
||||
Partitions []Partition `json:"partitions"`
|
||||
Wipe bool `json:"wipe"`
|
||||
}
|
||||
|
||||
type Partition struct {
|
||||
@@ -145,7 +145,6 @@ func (c *InstallConfig) ToArchInstall() *ArchInstallConfig {
|
||||
"firejail",
|
||||
"apparmor",
|
||||
"nftables", // Using nftables instead of ufw as requested
|
||||
"hardened-malloc",
|
||||
|
||||
// Browsers
|
||||
"chromium", // Using regular chromium instead of ungoogled-chromium as requested
|
||||
@@ -220,7 +219,7 @@ func (c *InstallConfig) SaveArchInstallConfig(filepath string) error {
|
||||
return fmt.Errorf("failed to marshal config: %w", err)
|
||||
}
|
||||
|
||||
return os.WriteFile(filepath, data, 0644)
|
||||
return os.WriteFile(filepath, data, 0o644)
|
||||
}
|
||||
|
||||
func (c *InstallConfig) SaveUserCredentials(filepath string) error {
|
||||
@@ -247,5 +246,5 @@ func (c *InstallConfig) SaveUserCredentials(filepath string) error {
|
||||
return fmt.Errorf("failed to marshal credentials: %w", err)
|
||||
}
|
||||
|
||||
return os.WriteFile(filepath, data, 0600)
|
||||
return os.WriteFile(filepath, data, 0o600)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user