[PATCH] OCI: Enable serial console by default

[PATCH] OCI: Enable serial console by default

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1589 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/grub2/00_cloud             | 8 ++++++++
 src/initscripts/system/partresize | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/config/grub2/00_cloud b/config/grub2/00_cloud
index 121cb2fbd..1ef5053e5 100644
--- a/config/grub2/00_cloud
+++ b/config/grub2/00_cloud
@@ -23,8 +23,16 @@ cat <<EOF
 # Read the system manufacturer string from the BIOS
 smbios --type 1 --get-string 4 --set system_manufacturer
 
+# Read the chassis asset tag
+smbios --type 3 --get-string 8 --set chassis_asset_tag
+
 # Are we on Amazon EC2?
 if [ "\$system_manufacturer" = "Amazon EC2" ]; then
 	next_entry=gnulinux-${KERNEL_RELEASE}-serial-${boot_device_id}
 fi
+
+# Are we on Oracle Cloud?
+if [ "\$chassis_asset_tag" = "OracleCloud.com" ]; then
+	next_entry=gnulinux-${KERNEL_RELEASE}-serial-${boot_device_id}
+fi
 EOF
diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize
index 4fa1906d0..2206ca451 100644
--- a/src/initscripts/system/partresize
+++ b/src/initscripts/system/partresize
@@ -45,9 +45,9 @@ case "${1}" in
 				esac
 			fi
 
-			# Enable the serial console on all systems on AWS EC2, Azure
-			# and Google Compute Platform
-			if running_on_ec2 || running_on_azure || running_on_gcp; then
+			# Enable the serial console on all systems on AWS EC2, Oracle Cloud,
+			# Azure and Google Compute Platform
+			if running_on_ec2 || running_on_oci || running_on_azure || running_on_gcp; then
 				scon="on"
 			fi
 
-- 
2.20.1