Merge pull request #1513 from jpculp/variant-specific-consoles

Move kernel console settings to variant tomls
bottlerocket-os · Apr 23, 2021 · 5d3db5e · 5d3db5e
2 parents 32e4a7b + 5eddb57
commit 5d3db5e
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 3 deletions.
diff --git a/tools/rpm2img b/tools/rpm2img
@@ -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 \\

diff --git a/variants/aws-dev/Cargo.toml b/variants/aws-dev/Cargo.toml
@@ -8,6 +8,10 @@ build = "build.rs"
 exclude = ["README.md"]
 
 [package.metadata.build-variant]
+kernel-parameters = [
+    "console=tty0",
+    "console=ttyS0",
+]
 included-packages = [
 # core
     "release",

diff --git a/variants/aws-ecs-1/Cargo.toml b/variants/aws-ecs-1/Cargo.toml
@@ -6,6 +6,10 @@ publish = false
 build = "build.rs"
 
 [package.metadata.build-variant]
+kernel-parameters = [
+    "console=tty0",
+    "console=ttyS0",
+]
 included-packages = [
 # core
     "release",

diff --git a/variants/aws-k8s-1.16/Cargo.toml b/variants/aws-k8s-1.16/Cargo.toml
@@ -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",

diff --git a/variants/aws-k8s-1.17/Cargo.toml b/variants/aws-k8s-1.17/Cargo.toml
@@ -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",

diff --git a/variants/aws-k8s-1.18/Cargo.toml b/variants/aws-k8s-1.18/Cargo.toml
@@ -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",

diff --git a/variants/aws-k8s-1.19/Cargo.toml b/variants/aws-k8s-1.19/Cargo.toml
@@ -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",

diff --git a/variants/vmware-dev/Cargo.toml b/variants/vmware-dev/Cargo.toml
@@ -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",