OCI: Enable serial console by default

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/grub2/00_cloud b/config/grub2/00_cloud
index 121cb2fbd606a9b5f24aa1da2da128f1f2e306b7..1ef5053e5d89a15363a1ee562e813b461b3ab824 100644 (file)
--- 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 4fa1906d0ada8eb7640121b18771dbf97c1ef50e..2206ca451604a948e12f139eb5506f37e3b2ebe7 100644 (file)
--- 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