Introduce KAIROS_ARTIFACT in bootargs.cfg and os-release (#535)

so store the full bootable artifact name as created by the naming.sh script in the kairos repo. Signed-off-by: Dimitris Karakasilis <[email protected]>
kairos-io · Nov 8, 2023 · e7e5761 · e7e5761
1 parent 5f15c21
commit e7e5761
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/packages/static/kairos-overlay-files/collection.yaml b/packages/static/kairos-overlay-files/collection.yaml
@@ -1,4 +1,4 @@
 packages:
   - name: "kairos-overlay-files"
     category: "static"
-    version: "1.1.11"
+    version: "1.1.12"
diff --git a/packages/static/kairos-overlay-files/files/etc/cos/bootargs.cfg b/packages/static/kairos-overlay-files/files/etc/cos/bootargs.cfg
@@ -1,7 +1,7 @@
 function setSelinux {
     source (loop0)/etc/os-release
     set baseSelinuxCmd=""
-    if regexp "rockylinux|fedora|almalinux|redhat" $KAIROS_FLAVOR; then
+    if regexp "rockylinux|fedora|almalinux|redhat" $KAIROS_ARTIFACT; then
         set baseSelinuxCmd="selinux=0"
     else
         # if not in recovery
@@ -15,11 +15,11 @@ function setExtraConsole {
     source (loop0)/etc/os-release
     set baseExtraConsole="console=ttyS0"
     # rpi
-    if regexp "arm-rpi" $KAIROS_FLAVOR; then
+    if regexp "arm64-rpi" $KAIROS_ARTIFACT; then
         set baseExtraConsole="console=ttyS0,115200"
     fi
     # nvidia orin
-    if regexp "arm-nvidia-jetson-agx-orin" $KAIROS_FLAVOR; then
+    if regexp "arm64-nvidia-jetson-agx-orin" $KAIROS_ARTIFACT; then
         set baseExtraConsole="console=ttyTCU0,115200"
     fi
 }
@@ -28,7 +28,7 @@ function setExtraArgs {
     source (loop0)/etc/os-release
     set baseExtraArgs=""
     # rpi
-    if regexp "arm-rpi" $KAIROS_FLAVOR; then
+    if regexp "arm64-rpi" $KAIROS_ARTIFACT; then
         set baseExtraArgs="modprobe.blacklist=vc4 8250.nr_uarts=1"
     fi
 }
@@ -61,4 +61,4 @@ function setKernelCmd {
 set kernel=/boot/vmlinuz
 set initramfs=/boot/initrd
 # set the kernelcmd dynamically
-setKernelCmd
+setKernelCmd
diff --git a/packages/static/kairos-overlay-files/files/usr/lib/os-release.tmpl b/packages/static/kairos-overlay-files/files/usr/lib/os-release.tmpl
@@ -10,4 +10,5 @@ KAIROS_IMAGE_REPO="${OS_REPO}"
 KAIROS_IMAGE_LABEL="${OS_LABEL}"
 KAIROS_GITHUB_REPO="${GITHUB_REPO}"
 KAIROS_VARIANT="${VARIANT}"
-KAIROS_FLAVOR="${FLAVOR}"
+KAIROS_FLAVOR="${FLAVOR}"
+KAIROS_ARTIFACT="${ARTIFACT}"