Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bootloader: Pass "options" to aboot bootloader backend #2902

Merged
merged 1 commit into from Jun 27, 2023

Conversation

ericcurtin
Copy link
Collaborator

aboot-deploy must know where the next root filesystem to boot is to set up a symlink /ostree/root.a or /ostree/root.b , this location is in the ostree= part of these passed in options.

aboot-deploy must know where the next root filesystem to boot is to set
up a symlink /ostree/root.a or /ostree/root.b , this location is in the
ostree= part of these passed in options.

Signed-off-by: Eric Curtin <ecurtin@redhat.com>
@openshift-ci
Copy link

openshift-ci bot commented Jun 26, 2023

Hi @ericcurtin. Thanks for your PR.

I'm waiting for a ostreedev member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ericcurtin
Copy link
Collaborator Author

ericcurtin commented Jun 26, 2023

This is the script it calls:

https://github.com/ericcurtin/aboot-deploy/blob/main/aboot-deploy

After a few upgrade cycles, this is what it looks like:

[root@localhost ~]# rpm-ostree status
State: idle
Deployments:
● auto-sig:cs9/aarch64/abootqemu-minimal
                  Version: 9.9 (2023-06-28T17:24:54Z)
                   Commit: 76fee8c28c91f92d598217254fabf3da17a309b4208bdc38a135ac54fc1e82de

  auto-sig:cs9/aarch64/abootqemu-minimal
                  Version: 9 (2023-06-28T17:17:17Z)
               BaseCommit: ebd830f8781f22c6d7b7c50c59912afb0866e7f5abfede2ace9c419a94589400
          LayeredPackages: git
[root@localhost ~]# ls -tlr /ostree/
total 20
lrwxrwxrwx. 1 root root   87 Jun 29 12:34 root.b -> deploy/centos/deploy/6ce6fe7c07c4274f7d536f6d505b34fc1453978f576c4b35d241ab7a4dd06898.0
drwxr-xr-x. 3 root root 4096 Jun 29 12:36 boot.1.1
lrwxrwxrwx. 1 root root    8 Jun 29 12:36 boot.1 -> boot.1.1
lrwxrwxrwx. 1 root root   87 Jun 29 12:37 root.a -> deploy/centos/deploy/76fee8c28c91f92d598217254fabf3da17a309b4208bdc38a135ac54fc1e82de.0
drwxr-xr-x. 3 root root 4096 Jun 29 12:37 deploy
drwxr-xr-x. 7 root root 4096 Jun 29 12:37 repo
[root@localhost ~]# cat /proc/cmdline
androidboot.slot_suffix=_a systemd.setenv=SLOT_SUFFIX=_a androidboot.bootdevice=*.ufshc root=UUID=76a22bf4-f153-4541-b6c7-0332c0dfaeac ro loglevel=4 efi=runtime libahci.ignore_sss=1 console=ttyAMA0 ostree=aboot

@martinezjavier
Copy link
Contributor

@ericcurtin looks good to me!

@cgwalters cgwalters enabled auto-merge June 27, 2023 06:33
@cgwalters
Copy link
Member

/ok-to-test

@cgwalters cgwalters merged commit 132bb6a into ostreedev:main Jun 27, 2023
18 of 21 checks passed
@ericcurtin ericcurtin deleted the ostree-aboot-pass-options branch June 29, 2023 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants