diff --git a/package/harvester-os/files/etc/cos/bootargs.cfg b/package/harvester-os/files/etc/cos/bootargs.cfg index cd181f6fc..45e829f45 100644 --- a/package/harvester-os/files/etc/cos/bootargs.cfg +++ b/package/harvester-os/files/etc/cos/bootargs.cfg @@ -1,10 +1,10 @@ set console_params="console=tty1" set kernel=/boot/vmlinuz set crash_kernel_params="crashkernel=219M,high crashkernel=72M,low" -if [ -n "$recoverylabel" ]; then - set kernelcmd="$console_params root=live:LABEL=$recoverylabel rd.live.dir=/ rd.live.squashimg=$img panic=0 net.ifnames=1 rd.cos.oemtimeout=120" +if [ "${img}" == "/cOS/recovery.img" ]; then + set kernelcmd="$console_params root=LABEL=$recovery_label cos-img/filename=$img rd.neednet=1 rd.cos.oemlabel=$oem_label rd.cos.mount=LABEL=$oem_label:/oem rd.cos.oemtimeout=120" else - set kernelcmd="$console_params root=LABEL=$label cos-img/filename=$img panic=0 net.ifnames=1 rd.cos.oemtimeout=120 rd.cos.oemlabel=COS_OEM audit=1 audit_backlog_limit=8192 intel_iommu=on amd_iommu=on iommu=pt" + set kernelcmd="$console_params root=LABEL=$state_label cos-img/filename=$img panic=0 net.ifnames=1 rd.cos.oemlabel=$oem_label rd.cos.mount=LABEL=$oem_label:/oem rd.cos.mount=LABEL=$persistent_label:/usr/local rd.cos.oemtimeout=120 audit=1 audit_backlog_limit=8192 intel_iommu=on amd_iommu=on iommu=pt" fi set initramfs=/boot/initrd diff --git a/package/harvester-os/files/system/oem/91_installer.yaml b/package/harvester-os/files/system/oem/91_installer.yaml index 9f109c8bb..7a929108c 100644 --- a/package/harvester-os/files/system/oem/91_installer.yaml +++ b/package/harvester-os/files/system/oem/91_installer.yaml @@ -11,4 +11,4 @@ stages: HARVESTER_DASHBOARD: "true" KUBECONFIG: /etc/rancher/rke2/rke2.yaml PATH: /var/lib/rancher/rke2/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin - if: 'grep -q root=LABEL=COS_ACTIVE /proc/cmdline && [ -n "$(blkid -L COS_ACTIVE)" ]' + if: 'grep -q root=LABEL=COS_STATE /proc/cmdline && [ -n "$(blkid -L COS_STATE)" ]' diff --git a/package/harvester-os/files/system/oem/91_rke2-shutdown.yaml b/package/harvester-os/files/system/oem/91_rke2-shutdown.yaml index ec1833314..32cccaaae 100644 --- a/package/harvester-os/files/system/oem/91_rke2-shutdown.yaml +++ b/package/harvester-os/files/system/oem/91_rke2-shutdown.yaml @@ -2,6 +2,6 @@ name: "Enable RKE2 shutdown service" stages: initramfs: - name: "enable rke2-shutdown.service" - if: 'grep -q root=LABEL=COS_ACTIVE /proc/cmdline && [ -n "$(blkid -L COS_ACTIVE)" ]' + if: 'grep -q root=LABEL=COS_STATE /proc/cmdline && [ -n "$(blkid -L COS_STATE)" ]' commands: - systemctl enable rke2-shutdown.service \ No newline at end of file diff --git a/package/harvester-os/files/usr/sbin/harv-install b/package/harvester-os/files/usr/sbin/harv-install index 0f13dd69b..bf66354b4 100755 --- a/package/harvester-os/files/usr/sbin/harv-install +++ b/package/harvester-os/files/usr/sbin/harv-install @@ -326,7 +326,7 @@ get_crashkernel_params() add_debug_grub_entry() { - cat > "${STATEDIR}/grubmenu" << "EOF" + cat > "${STATEDIR}/grubcustom" << "EOF" menuentry "${display_name} (debug)" --id debug { search --no-floppy --set=root --label COS_STATE set img=/cOS/active.img diff --git a/scripts/package-harvester-os b/scripts/package-harvester-os index d0b7ca73b..af46b4b9b 100755 --- a/scripts/package-harvester-os +++ b/scripts/package-harvester-os @@ -17,7 +17,7 @@ source ${SCRIPTS_DIR}/version-harvester ${TOP_DIR}/../harvester source ${SCRIPTS_DIR}/version-monitoring source ${SCRIPTS_DIR}/version-logging -BASE_OS_IMAGE="rancher/harvester-os:20230615" +BASE_OS_IMAGE="rancher/harvester-os:sle-micro-head" HARVESTER_OS_IMAGE=rancher/harvester-os:$VERSION cd ${PACKAGE_HARVESTER_OS_DIR}