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

distro/fedora: Set default target for ami/ec2 image type to multi-user and remove extra console entry in kernel opts

Browse source
This commit is contained in:
Jordi Gil 2022-04-22 10:46:35 -04:00 • committed by Tomáš Hozza
parent 1d0e5c3410
commit 40d5950f1e
5 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
test/data/manifests/fedora_34-aarch64-ami-boot.json
View file

@ -1169,7 +1169,7 @@
"type": "org.osbuild.kernel-cmdline",
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"kernel_opts": "ro no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
"kernel_opts": "ro no_timer_check net.ifnames=0 console=tty1"
}
},
{
@ -3000,7 +3000,8 @@
"options": {
"enabled_services": [
"cloud-init.service"
]
],
"default_target": "multi-user.target"
}
},
{
@ -11779,7 +11780,7 @@
"grub_users": "$grub_users",
"initrd": "/initramfs-5.15.13-100.fc34.aarch64.img",
"linux": "/vmlinuz-5.15.13-100.fc34.aarch64",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check net.ifnames=0 console=tty1",
"title": "Fedora (5.15.13-100.fc34.aarch64) 34 (Thirty Four)",
"version": "5.15.13-100.fc34.aarch64"
}

7
test/data/manifests/fedora_34-x86_64-ami-boot.json
View file

@ -1184,7 +1184,7 @@
"type": "org.osbuild.kernel-cmdline",
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"kernel_opts": "ro no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
"kernel_opts": "ro no_timer_check net.ifnames=0 console=tty1"
}
},
{
@ -2995,7 +2995,8 @@
"options": {
"enabled_services": [
"cloud-init.service"
]
],
"default_target": "multi-user.target"
}
},
{
@ -11789,7 +11790,7 @@
"grub_users": "$grub_users",
"initrd": "/initramfs-5.15.13-100.fc34.x86_64.img",
"linux": "/vmlinuz-5.15.13-100.fc34.x86_64",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check net.ifnames=0 console=tty1",
"title": "Fedora (5.15.13-100.fc34.x86_64) 34 (Thirty Four)",
"version": "5.15.13-100.fc34.x86_64"
}

7
test/data/manifests/fedora_35-aarch64-ami-boot.json
View file

@ -1199,7 +1199,7 @@
"type": "org.osbuild.kernel-cmdline",
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"kernel_opts": "ro no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
"kernel_opts": "ro no_timer_check net.ifnames=0 console=tty1"
}
},
{
@ -3090,7 +3090,8 @@
"options": {
"enabled_services": [
"cloud-init.service"
]
],
"default_target": "multi-user.target"
}
},
{
@ -12068,7 +12069,7 @@
"grub_users": "$grub_users",
"initrd": "/initramfs-5.15.13-200.fc35.aarch64.img",
"linux": "/vmlinuz-5.15.13-200.fc35.aarch64",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check net.ifnames=0 console=tty1",
"title": "Fedora Linux (5.15.13-200.fc35.aarch64) 35 (Thirty Five)",
"version": "5.15.13-200.fc35.aarch64"
}

11
test/data/manifests/fedora_35-x86_64-ami-boot.json
View file

@ -1214,7 +1214,7 @@
"type": "org.osbuild.kernel-cmdline",
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"kernel_opts": "ro no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8"
"kernel_opts": "ro no_timer_check net.ifnames=0 console=tty1"
}
},
{
@ -3085,7 +3085,8 @@
"options": {
"enabled_services": [
"cloud-init.service"
]
],
"default_target": "multi-user.target"
}
},
{
@ -3119,7 +3120,7 @@
"options": {
"root_fs_uuid": "6e4ff95f-f662-45ee-a82a-bdf44a2d0b75",
"boot_fs_uuid": "0194fdc2-fa2f-4cc0-81d3-ff12045b73c8",
"legacy": "i386-pc",
"legacy": "i386-pc",
"saved_entry": "ffffffffffffffffffffffffffffffff-5.15.13-200.fc35.x86_64",
"write_cmdline": false,
"config": {
@ -12078,7 +12079,7 @@
"grub_users": "$grub_users",
"initrd": "/initramfs-5.15.13-200.fc35.x86_64.img",
"linux": "/vmlinuz-5.15.13-200.fc35.x86_64",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8",
"options": "root=UUID=6e4ff95f-f662-45ee-a82a-bdf44a2d0b75 ro no_timer_check net.ifnames=0 console=tty1",
"title": "Fedora Linux (5.15.13-200.fc35.x86_64) 35 (Thirty Five)",
"version": "5.15.13-200.fc35.x86_64"
}
@ -12200,7 +12201,7 @@
}
}
},
"default-target": "graphical.target",
"default-target": "multi-user.target",
"dnf": {
"dnf.conf": {
"main": {