-
Notifications
You must be signed in to change notification settings - Fork 290
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
switchroot: Fix regression for separately mounted /var #1668
Conversation
I made a logical error in ostreedev#1617 which resulted in the exact *opposite* behaviour we want when `/var` is a separate mount. Split this out and lower the number of negations to make it more obvious that it's correct. Closes: ostreedev#1667
Marking as WIP. I'll sanity check this tomorrow for both the separate |
Test case I was playing with, but I'm officially on vacation today:
Mind trying this out and verifying it fails without your patch too? |
r=me if this works! |
One gotcha here is that we don't invalidate the RPMs if we're not sitting on the same commit anymore. Shouldn't be too hard to fix, though let's at least make a note of it for now.
Sigh, spent a while banging my head before I realized I was rsync'ing the wrong ostree bits. 🔀 I've verified that:
Thanks for the testcase! One tweak I had to make was: diff --git a/tests/installed/tasks/install-git.yml b/tests/installed/tasks/install-git.yml
index 8216afeb..3374cce7 100644
--- a/tests/installed/tasks/install-git.yml
+++ b/tests/installed/tasks/install-git.yml
@@ -8,6 +8,9 @@
synchronize: src=build/x86_64/ dest=/root/x86_64/ archive=yes
- name: Install RPMs
shell: rpm-ostree override replace /root/x86_64/*.rpm
+# Regenerate to make sure new ostree binaries also make it to the initrd
+- name: Regenerate initramfs
+ shell: rpm-ostree initramfs --enable
- import_tasks: ../tasks/reboot.yml
- import_tasks: ../tasks/query-host.yml
- command: ostree --version (I also tweaked the task name in the test). @rh-atomic-bot r=cgwalters 4370722 |
Closes: #1668 Approved by: cgwalters
One gotcha here is that we don't invalidate the RPMs if we're not sitting on the same commit anymore. Shouldn't be too hard to fix, though let's at least make a note of it for now. Closes: #1668 Approved by: cgwalters
💡 This pull request was already approved, no need to approve it again.
|
☀️ Test successful - status-atomicjenkins |
I made a logical error in #1617 which resulted in the exact opposite
behaviour we want when
/var
is a separate mount.Split this out and lower the number of negations to make it more obvious
that it's correct.
Closes: #1667