rancher/packages
1
0
Fork 0
mirror of https://github.com/kairos-io/packages.git synced 2025-08-14 22:25:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop regex module from bootargs (#619)

Browse Source 
Co-authored-by: Mauro Morales <mauro.morales@spectrocloud.com>
This commit is contained in:
Itxaka 2024-01-15 13:36:09 +01:00 committed by GitHub
parent e0c1f0d96b
commit 89f59422ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/static/grub-config/definition.yaml
View File

@ -1,3 +1,3 @@
name: "grub-config" name: "grub-config"
category: "static" category: "static"
version: "0.10" version: "0.11"

2
packages/static/grub-config/files/grub.cfg
View File

@ -57,7 +57,7 @@ insmod all_video
insmod loopback insmod loopback
insmod squash4 insmod squash4
insmod serial insmod serial
insmod regexp
loadfont unicode loadfont unicode
if [ "${grub_platform}" = "efi" ]; then if [ "${grub_platform}" = "efi" ]; then
## workaround for grub2-efi bug: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1851311 ## workaround for grub2-efi bug: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1851311

2
packages/static/kairos-overlay-files/collection.yaml
View File

@ -1,4 +1,4 @@
packages: packages:
- name: "kairos-overlay-files" - name: "kairos-overlay-files"
category: "static" category: "static"
version: "1.1.20" version: "1.1.21"

9
packages/static/kairos-overlay-files/files/etc/cos/bootargs.cfg
View File

@ -1,7 +1,7 @@
function setSelinux { function setSelinux {
source (loop0)/etc/os-release source (loop0)/etc/os-release
set baseSelinuxCmd="" set baseSelinuxCmd=""
if regexp "rockylinux|fedora|almalinux|redhat|tumbleweed" $KAIROS_ARTIFACT; then if test $KAIROS_FAMILY == "rhel" -o test $ID == "opensuse-tumbleweed"; then
set baseSelinuxCmd="selinux=0" set baseSelinuxCmd="selinux=0"
else else
# if not in recovery # if not in recovery
@ -15,11 +15,11 @@ function setExtraConsole {
source (loop0)/etc/os-release source (loop0)/etc/os-release
set baseExtraConsole="console=ttyS0" set baseExtraConsole="console=ttyS0"
# rpi # rpi
if regexp "arm64-rpi" $KAIROS_ARTIFACT; then if test $KAIROS_MODEL == "rpi3" -o test $KAIROS_MODEL == "rpi4"; then
set baseExtraConsole="console=ttyS0,115200" set baseExtraConsole="console=ttyS0,115200"
fi fi
# nvidia orin # nvidia orin
if regexp "arm64-nvidia-jetson-agx-orin" $KAIROS_ARTIFACT; then if test $KAIROS_MODEL == "nvidia-jetson-agx-orin"; then
set baseExtraConsole="console=ttyTCU0,115200" set baseExtraConsole="console=ttyTCU0,115200"
fi fi
} }
@ -28,7 +28,7 @@ function setExtraArgs {
source (loop0)/etc/os-release source (loop0)/etc/os-release
set baseExtraArgs="" set baseExtraArgs=""
# rpi # rpi
if regexp "arm64-rpi" $KAIROS_ARTIFACT; then if test $KAIROS_MODEL == "rpi3" -o test $KAIROS_MODEL == "rpi4"; then
set baseExtraArgs="modprobe.blacklist=vc4 8250.nr_uarts=1" set baseExtraArgs="modprobe.blacklist=vc4 8250.nr_uarts=1"
fi fi
} }
@ -54,7 +54,6 @@ function setKernelCmd {
set kernelcmd="$baseExtraConsole $baseCmd $baseRootCmd $baseSelinuxCmd $baseExtraArgs" set kernelcmd="$baseExtraConsole $baseCmd $baseRootCmd $baseSelinuxCmd $baseExtraArgs"
} }
# grub.cfg now ships this but during upgrades we do not update the COS_GRUB partition, so no new grub.cfg is copied over there # grub.cfg now ships this but during upgrades we do not update the COS_GRUB partition, so no new grub.cfg is copied over there
# We need to keep it for upgrades to work. # We need to keep it for upgrades to work.
# TODO: Deprecate in v2.8-v3.0 # TODO: Deprecate in v2.8-v3.0