rancher/packages
1
0
Fork 0
mirror of https://github.com/kairos-io/packages.git synced 2025-09-04 00:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use kairos-release instead of os-release (#1082)

Browse Source
This commit is contained in:
Itxaka
2024-10-07 11:43:48 +02:00
committed by GitHub
parent 8facccf729
commit 9232f7eed6
5 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.58" version: "1.2.0"

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

@@ -1,5 +1,8 @@
function setSelinux { function setSelinux {
source (loop0)/etc/os-release source (loop0)/etc/os-release
if [ -f (loop0)/etc/kairos-release ]; then
source (loop0)/etc/kairos-release
fi
# Disable selinux for all distros. Supporting selinux requires more than # Disable selinux for all distros. Supporting selinux requires more than
# just enabling it like this. # just enabling it like this.
@@ -16,7 +19,10 @@ function setSelinux {
} }
function setExtraConsole { function setExtraConsole {
source (loop0)/etc/os-release source (loop0)/etc/kairos-release
if [ -f (loop0)/etc/kairos-release ]; then
source (loop0)/etc/kairos-release
fi
set baseExtraConsole="console=ttyS0" set baseExtraConsole="console=ttyS0"
# rpi # rpi
if test $KAIROS_MODEL == "rpi3" -o test $KAIROS_MODEL == "rpi4"; then if test $KAIROS_MODEL == "rpi3" -o test $KAIROS_MODEL == "rpi4"; then
@@ -29,7 +35,10 @@ function setExtraConsole {
} }
function setExtraArgs { function setExtraArgs {
source (loop0)/etc/os-release source (loop0)/etc/kairos-release
if [ -f (loop0)/etc/kairos-release ]; then
source (loop0)/etc/kairos-release
fi
set baseExtraArgs="" set baseExtraArgs=""
# rpi # rpi
if test $KAIROS_MODEL == "rpi3" -o test $KAIROS_MODEL == "rpi4"; then if test $KAIROS_MODEL == "rpi3" -o test $KAIROS_MODEL == "rpi4"; then

1
packages/static/kairos-overlay-files/files/system/oem/50_recovery.yaml
View File

@@ -22,6 +22,7 @@ stages:
commands: commands:
- | - |
. /etc/os-release . /etc/os-release
[ -f "/etc/kairos-release" ] && . /etc/kairos-release
echo >> /etc/issue echo >> /etc/issue
echo "You are booting from recovery mode. Run 'kairos-agent reset' to reset the system to $VERSION" >> /etc/issue echo "You are booting from recovery mode. Run 'kairos-agent reset' to reset the system to $VERSION" >> /etc/issue
echo " or 'kairos-agent upgrade' to upgrade the active partition" >> /etc/issue echo " or 'kairos-agent upgrade' to upgrade the active partition" >> /etc/issue

2
packages/system/suc-upgrade/definition.yaml
View File

@@ -1,3 +1,3 @@
name: "suc-upgrade" name: "suc-upgrade"
category: "system" category: "system"
version: "0.2.3" version: "0.3.0"

21
packages/system/suc-upgrade/suc-upgrade.sh
View File

@@ -3,10 +3,23 @@ set -x -e
HOST_DIR="${HOST_DIR:-/host}" HOST_DIR="${HOST_DIR:-/host}"
if [ "$FORCE" != "true" ]; then if [ "$FORCE" != "true" ]; then
if diff /etc/os-release $HOST_DIR/etc/os-release >/dev/null; then if [ -f "/etc/kairos-release" ]; then
echo Update to date with UPDATE_VERSION=$(source /etc/kairos-release && echo "${KAIROS_VERSION}")
cat /etc/os-release else
exit 0 UPDATE_VERSION=$(source /etc/os-release && echo "${KAIROS_VERSION}")
fi
if [ -f "/etc/kairos-release" ]; then
CURRENT_VERSION=$(source "${HOST_DIR}"/etc/kairos-release && echo "${KAIROS_VERSION}")
else
CURRENT_VERSION=$(source "${HOST_DIR}"/etc/os-release && echo "${KAIROS_VERSION}")
fi
if [ "$CURRENT_VERSION" == "$UPDATE_VERSION" ]; then
echo Up to date
echo "Current version: ${CURRENT_VERSION}"
echo "Update version: ${UPDATE_VERSION}"
exit 0
fi fi
fi fi