switchroot: Allow letting ostree-prepare-root mount /var #1617
Conversation
In some scenarios, it might make sense to let `ostree-prepare-root` do the `/var` mount from the state root as before. For example, one may want to do some system configuration before the switch root. This of course comes at the expense of supporting `/var` as a mount point in `/etc/fstab`.
| @@ -49,6 +49,13 @@ main(int argc, char *argv[]) | |||
| exit (EXIT_SUCCESS); | |||
| } | |||
|
|
|||
| /* We conflict with the magic ostree-mount-deployment-var file for ostree-prepare-root */ | |||
| { struct stat stbuf; | |||
| if (fstatat (AT_FDCWD, "/run/ostree-mount-deployment-var", &stbuf, 0) == 0) | |||
There was a problem hiding this comment.
Let's maybe be nice and unlinkat() here in the interest of having /run be less littered. Or in addition/alternatively, make the file /run/ostree/initramfs-mount-var since we already made /run/ostree/ for the deployment staging bits.
| if (fstatat (AT_FDCWD, "/run/ostree-mount-deployment-var", &stbuf, 0) == 0) | ||
| exit (EXIT_SUCCESS); | ||
| } | ||
|
|
|
Added fixup! I also tested this successfully now. |
jlebon
changed the title
|
Hmm, it's not clear why |
| @@ -49,6 +49,16 @@ main(int argc, char *argv[]) | |||
| exit (EXIT_SUCCESS); | |||
| } | |||
|
|
|||
| /* We conflict with the magic ostree-mount-deployment-var file for ostree-prepare-root */ | |||
| { struct stat stbuf; | |||
| if (fstatat (AT_FDCWD, INITRAMFS_MOUNT_VAR, &stbuf, 0) == 0) | |||
There was a problem hiding this comment.
Could just do if (unlinkat (...) == 0) but eh.
|
The insttest has been flaking a bit in PRs, will look at adding some debug info. Let's see if it bounces. |
|
☀️ Test successful - status-atomicjenkins |
src/switchroot/ostree-prepare-root.c
Outdated
| #ifndef HAVE_SYSTEMD_AND_LIBMOUNT | ||
| /* file in /run can override that behaviour */ | ||
| if (lstat ("/run/ostree-mount-deployment-var", &stbuf) < 0) | ||
| mount_var = false; |
There was a problem hiding this comment.
@jlebon Isn't the logic backwards here? We should default mount_var = false, and set it true here?
Got a report on IRC that /var in /etc/fstab broke after a silverblue update.
There was a problem hiding this comment.
I also think we need to have this bit outside of the #ifndef HAVE_SYSTEMD_AND_LIBMOUNT right? I'm not sure how this could have worked as we're building Fedora with that conditional set right?
There was a problem hiding this comment.
Ouch, yes, you're correct this is the exact opposite. I think the double negation with #ifndef confused me. Fixup coming up!
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
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
In some scenarios, it might make sense to let
ostree-prepare-rootdothe
/varmount from the state root as before. For example, one maywant to do some system configuration before the switch root. This of
course comes at the expense of supporting
/varas a mount point in/etc/fstab.