Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move kernel console settings to variant tomls #1513

Merged
merged 1 commit into from
Apr 23, 2021
Merged

Move kernel console settings to variant tomls #1513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tools/rpm2img
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,10 @@ set default="0"
set timeout="0"

menuentry "${PRETTY_NAME} ${VERSION_ID}" {
linux (\$root)/vmlinuz \\
linux (\$root)/vmlinuz root=/dev/dm-0 \\
${KERNEL_PARAMETERS} \\
root=/dev/dm-0 rootwait ro \\
console=tty0 console=ttyS0 random.trust_cpu=on selinux=1 enforcing=1 \\
rootwait ro \\
random.trust_cpu=on selinux=1 enforcing=1 \\
systemd.log_target=journal-or-kmsg systemd.log_color=0 net.ifnames=0 \\
biosdevname=0 dm_verity.max_bios=-1 dm_verity.dev_wait=1 \\
dm-mod.create="root,,,ro,0 $VERITY_DATA_512B_BLOCKS verity $VERITY_VERSION PARTUUID=\$boot_uuid/PARTNROFF=1 PARTUUID=\$boot_uuid/PARTNROFF=2 \\
Expand Down
4 changes: 4 additions & 0 deletions variants/aws-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ build = "build.rs"
exclude = ["README.md"]

[package.metadata.build-variant]
kernel-parameters = [
"console=tty0",
"console=ttyS0",
]
included-packages = [
# core
"release",
Expand Down
4 changes: 4 additions & 0 deletions variants/aws-ecs-1/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ publish = false
build = "build.rs"

[package.metadata.build-variant]
kernel-parameters = [
"console=tty0",
"console=ttyS0",
]
included-packages = [
# core
"release",
Expand Down
4 changes: 4 additions & 0 deletions variants/aws-k8s-1.16/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ build = "build.rs"
exclude = ["README.md"]

[package.metadata.build-variant]
kernel-parameters = [
"console=tty0",
"console=ttyS0",
]
included-packages = [
"aws-iam-authenticator",
"cni",
Expand Down
4 changes: 4 additions & 0 deletions variants/aws-k8s-1.17/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ build = "build.rs"
exclude = ["README.md"]

[package.metadata.build-variant]
kernel-parameters = [
"console=tty0",
"console=ttyS0",
]
included-packages = [
"aws-iam-authenticator",
"cni",
Expand Down
4 changes: 4 additions & 0 deletions variants/aws-k8s-1.18/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ build = "build.rs"
exclude = ["README.md"]

[package.metadata.build-variant]
kernel-parameters = [
"console=tty0",
"console=ttyS0",
]
included-packages = [
"aws-iam-authenticator",
"cni",
Expand Down
4 changes: 4 additions & 0 deletions variants/aws-k8s-1.19/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ build = "build.rs"
exclude = ["README.md"]

[package.metadata.build-variant]
kernel-parameters = [
"console=tty0",
"console=ttyS0",
]
included-packages = [
"aws-iam-authenticator",
"cni",
Expand Down
4 changes: 4 additions & 0 deletions variants/vmware-dev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ exclude = ["README.md"]
[package.metadata.build-variant]
image-format = "vmdk"
supported-arches = ["x86_64"]
kernel-parameters = [
"console=ttyS0",
"console=tty1",
]
included-packages = [
# core
"release",
Expand Down