Merge pull request #1483 from jrosser/grub-config

Match ubuntu grub configuration with Canonical cloud-images

Author: k8s-ci-robot

images/capi/ansible/roles/sysprep/files/etc/default/grub.d/50-cloudimg-settings.cfg

@@ -0,0 +1,14 @@
+# Cloud Image specific Grub settings for Cloud Images
+# This file was created/modified by the k8s image-builder process
+
+# Set the recordfail timeout
+GRUB_RECORDFAIL_TIMEOUT=0
+
+# Do not wait on grub prompt
+GRUB_TIMEOUT=0
+
+# Set the default commandline
+GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0"
+
+# Set the grub console type
+GRUB_TERMINAL=console

images/capi/ansible/roles/sysprep/handlers/main.yml

@@ -0,0 +1,18 @@
+# Copyright 2024 The Kubernetes Authors.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+# http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+---
+- name: Update debian grub
+  ansible.builtin.shell: |
+    update-grub
+  changed_when: true

images/capi/ansible/roles/sysprep/tasks/debian.yml

@@ -99,6 +99,16 @@
     state: absent
     path: /etc/udev/rules.d/70-persistent-net.rules
 
+- name: Configure grub for non graphical consoles
+  ansible.builtin.copy:
+    src: etc/default/grub.d/50-cloudimg-settings.cfg
+    dest: /etc/default/grub.d/50-cloudimg-settings.cfg
+    group: root
+    owner: root
+    mode: "0644"
+  notify:
+    - Update debian grub
+
 - name: Remvoing subiquity disable disable cloud-init networking config
   ansible.builtin.file:
     path: /etc/cloud/cloud.cfg.d/subiquity-disable-cloudinit-networking.cfg