particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro/f30/ami: make the images boot on aws

Browse source 
This makes the image in line whith the ones produced by lorax.

Signed-off-by: Tom Gundersen <teg@jklm.no>
This commit is contained in:
Tom Gundersen 2019-11-26 00:53:49 +01:00 • committed by Lars Karlitski
parent de93ddc757
commit 382d4e2118
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/distro/fedora30/ami.go
View file

@ -30,9 +30,9 @@ func (t *amiOutput) translate(b *blueprint.Blueprint) (*pipeline.Pipeline, error
return nil, err
}
setFilesystems(p)
setBootloader(p, "ro biosdevname=0 net.ifnames=0", b)
setBootloader(p, "ro no_timer_check console=ttyS0,115200n8 console=tty1 biosdevname=0 net.ifnames=0 console=ttyS0,115200", b)
setFirewall(p, nil, nil, b)
setServices(p, nil, nil, b)
setServices(p, []string{"cloud-init.service"}, nil, b)
setQemuAssembler(p, "raw", t.getName())
return p, nil

14
test/cases/ami_empty_blueprint.json
View file

@ -94,7 +94,15 @@
"options": {
"root_fs_uuid": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"boot_fs_uuid": "00000000-0000-0000-0000-000000000000",
"kernel_opts": "ro biosdevname=0 net.ifnames=0"
"kernel_opts": "ro no_timer_check console=ttyS0,115200n8 console=tty1 biosdevname=0 net.ifnames=0 console=ttyS0,115200"
}
},
{
"name": "org.osbuild.systemd",
"options": {
"enabled_services": [
"cloud-init.service"
]
}
},
{
@ -119,7 +127,7 @@
"boot-environment": {
"GRUB2_BOOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"GRUB2_ROOT_FS_UUID": "76a22bf4-f153-4541-b6c7-0332c0dfaeac",
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro biosdevname=0 net.ifnames=0"
"kernelopts": "root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro no_timer_check console=ttyS0,115200n8 console=tty1 biosdevname=0 net.ifnames=0 console=ttyS0,115200"
},
"bootloader": "grub",
"bootmenu": [
@ -621,7 +629,6 @@
"cloud-config.service",
"cloud-final.service",
"cloud-init-local.service",
"cloud-init.service",
"console-getty.service",
"debug-shell.service",
"ebtables.service",
@ -664,6 +671,7 @@
"auditd.service",
"autovt@.service",
"chronyd.service",
"cloud-init.service",
"dbus-broker.service",
"dbus-org.fedoraproject.FirewallD1.service",
"dbus-org.freedesktop.nm-dispatcher.service",