Browse Source

Merge pull request #553 from kacf/3.0.x

fix(grub-mender-grubenv): Boot failure because of missing storage.
3.0.x 3.0.2
Kristian Amlie 2 years ago
committed by GitHub
parent
commit
a927257503
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      .gitlab-ci.yml
  2. 2
      configs/mender_grub_config

4
.gitlab-ci.yml

@ -100,7 +100,7 @@ build:
services:
- docker:dind
tags:
- mender-qa-slave
- mender-qa-worker-generic
before_script:
- apt update && apt install -yy bash wget xz-utils awscli docker.io curl
@ -162,7 +162,7 @@ convert_raspbian_raspberrypi4:
services:
- docker:dind
tags:
- mender-qa-slave
- mender-qa-worker-mender-convert-tests
timeout: 2h
before_script:
- *bash_helpers

2
configs/mender_grub_config

@ -26,7 +26,7 @@ GRUB_VERSION=2.04
MENDER_GRUB_KERNEL_BOOT_ARGS=""
# grub-mender-grubenv is the Mender integration for the GRUB bootloader
MENDER_GRUBENV_VERSION="eeb7ebd9e6558cf6bbe661b4f2e4e45d52efa305"
MENDER_GRUBENV_VERSION="a525df022c10950ddbadad05adaefe7b2451ec62"
MENDER_GRUBENV_URL="${MENDER_GITHUB_ORG}/grub-mender-grubenv/archive/${MENDER_GRUBENV_VERSION}.tar.gz"
# Name of the storage device containing root filesystem partitions in GRUB

Loading…
Cancel
Save