Cleanup, rename kernel_features to match purpose

Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2024-03-26 13:28:32 +01:00
parent 0b482401e9
commit e4cd2dd84f
Signed by: luzifer
SSH key fingerprint: SHA256:/xtE5lCgiRDQr8SLxHMS92ZBlACmATUmF1crK16Ks4E
4 changed files with 70 additions and 83 deletions

View file

@ -1,27 +1,5 @@
# Please see default.json for default values for these
variable "apk_tools_url" {}
variable "apk_tools_arch" {}
variable "apk_tools_version" {}
variable "apk_tools_checksum" {}
variable "alpine_mirror" {}
variable "alpine_repositories" {}
variable "alpine_repository_keys" {}
variable "boot_size" {}
variable "root_size" {}
variable "hostname" {}
variable "dhcp_interfaces" {}
variable "packages" {}
variable "services" {}
variable "nameservers" {}
variable "extlinux_modules" {}
variable "kernel_features" {}
variable "kernel_modules" {}
variable "default_kernel_opts" {}
variable "sysctl" {}
variable "chroot_commands" {}
locals {
timestamp = formatdate("YYYYMMDD-hhmmss", timestamp())

View file

@ -1,61 +1,70 @@
{
"apk_tools_version": "v2.12.9",
"apk_tools_arch": "x86_64",
"apk_tools_url": "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//{{ apk_tools_version }}/{{ apk_tools_arch }}/apk.static",
"apk_tools_checksum": "sha256:5176da3d4c41f12a08b82809aca8e7e2e383b7930979651b8958eca219815af5",
"alpine_repositories": [
{"tag":"", "url": "http://dl-cdn.alpinelinux.org/alpine/edge/main"},
{"tag":"", "url": "http://dl-cdn.alpinelinux.org/alpine/edge/community"},
],
"alpine_repository_keys": [],
"boot_size": "+100m",
"root_size": "0",
"hostname": "alpine",
"dhcp_interfaces": ["eth0"],
"packages": {
"openssh": "=8.8_p1-r1",
"syslinux": "=6.04_pre1-r9",
"linux-virt": "=5.15.16-r0",
"cloud-init": "@community=21.4-r0"
"apk_tools_version": "v2.12.9",
"apk_tools_arch": "x86_64",
"apk_tools_url": "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//{{ apk_tools_version }}/{{ apk_tools_arch }}/apk.static",
"apk_tools_checksum": "sha256:5176da3d4c41f12a08b82809aca8e7e2e383b7930979651b8958eca219815af5",
"alpine_repositories": [
{
"tag": "",
"url": "http://dl-cdn.alpinelinux.org/alpine/edge/main"
},
"services": {
"devfs": "sysinit",
"dmesg": "sysinit",
"mdev": "sysinit",
"hwdrivers": "sysinit",
"hwclock": "boot",
"modules": "boot",
"sysctl": "boot",
"hostname": "boot",
"bootmisc": "boot",
"syslog": "boot",
"networking": "boot",
"mount-ro": "shutdown",
"killprocs": "shutdown",
"savecache": "shutdown",
"sshd": "default"
},
"nameservers": [
"185.12.64.1",
"185.12.64.2",
"2a01:4ff:ff00::add:1",
"2a01:4ff:ff00::add:2"
],
"sysctl": {},
"extlinux_modules": ["ext4"],
"kernel_features": ["base", "ext4", "keymap", "virtio"],
"kernel_modules": ["ipv6", "af_packet"],
"default_kernel_opts": ["quiet"],
"chroot_commands": []
}
{
"tag": "",
"url": "http://dl-cdn.alpinelinux.org/alpine/edge/community"
}
],
"alpine_repository_keys": [],
"boot_size": "+100m",
"root_size": "0",
"hostname": "alpine",
"dhcp_interfaces": [
"eth0"
],
"packages": {
"openssh": "=8.8_p1-r1",
"syslinux": "=6.04_pre1-r9",
"linux-virt": "=5.15.16-r0",
"cloud-init": "@community=21.4-r0"
},
"services": {
"devfs": "sysinit",
"dmesg": "sysinit",
"mdev": "sysinit",
"hwdrivers": "sysinit",
"hwclock": "boot",
"modules": "boot",
"sysctl": "boot",
"hostname": "boot",
"bootmisc": "boot",
"syslog": "boot",
"networking": "boot",
"mount-ro": "shutdown",
"killprocs": "shutdown",
"savecache": "shutdown",
"sshd": "default"
},
"nameservers": [
"185.12.64.1",
"185.12.64.2",
"2a01:4ff:ff00::add:1",
"2a01:4ff:ff00::add:2"
],
"sysctl": {},
"extlinux_modules": [
"ext4"
],
"mkinitfs_features": [
"base",
"ext4",
"keymap",
"virtio"
],
"kernel_modules": [
"ipv6",
"af_packet"
],
"default_kernel_opts": [
"quiet"
],
"chroot_commands": []
}

View file

@ -177,7 +177,7 @@
copy:
dest: "{{ chroot_directory }}/etc/mkinitfs/mkinitfs.conf"
content: |
features="{{ kernel_features | join(" ") }}"
features="{{ mkinitfs_features | join(" ") }}"
- name: install boot
shell: |

View file

@ -117,7 +117,7 @@ sysctl:
extlinux_modules:
- ext4
kernel_features:
mkinitfs_features:
- ata
- base
- ext4