switchroot: Fix regression for separately mounted /var

src/switchroot/ostree-prepare-root.c

@@ -151,14 +151,17 @@ main(int argc, char *argv[])
   if (chdir (deploy_path) < 0)
     err (EXIT_FAILURE, "failed to chdir to deploy_path");
 
+  /* Default to true, but in the systemd case, default to false because it's handled by
+   * ostree-system-generator. */
   bool mount_var = true;
-  /* In the systemd case, this is handled by ostree-system-generator by default */
-#ifndef HAVE_SYSTEMD_AND_LIBMOUNT
-  /* file in /run can override that behaviour */
-  if (lstat (INITRAMFS_MOUNT_VAR, &stbuf) < 0)
-    mount_var = false;
+#ifdef HAVE_SYSTEMD_AND_LIBMOUNT
+  mount_var = false;
 #endif
 
+  /* file in /run can override the default behaviour so that we definitely mount /var */
+  if (lstat (INITRAMFS_MOUNT_VAR, &stbuf) == 0)
+    mount_var = true;
+
   /* Link to the deployment's /var */
   if (mount_var && mount ("../../var", "var", NULL, MS_MGC_VAL|MS_BIND, NULL) < 0)
     err (EXIT_FAILURE, "failed to bind mount ../../var to var");

tests/installed/destructive-ansible.yml

@@ -13,3 +13,4 @@
       when: use_git_build
     - import_tasks: tasks/query-host.yml
     - import_tasks: destructive/staged-deploy.yml
+    - import_tasks: destructive/var-mount.yml

tests/installed/destructive/var-mount.yml

@@ -0,0 +1,13 @@
+# https://github.com/ostreedev/ostree/issues/1667
+- name: Set up /var as a mountpoint
+  shell: |
+    set -xeuo pipefail
+    cp -a /var /sysroot/myvar
+    touch /sysroot/myvar/somenewfile
+    echo '/sysroot/myvar /var none bind 0 0' >> /etc/fstab
+- include_tasks: ../tasks/reboot.yml
+- name: Check that /var mountpoint worked
+  shell: |
+    set -xeuo pipefail
+    systemctl status var.mount
+    test -f /var/somenewfile

tests/installed/playbook-run.sh

@@ -7,6 +7,10 @@ dn=$(cd $(dirname $0) && pwd)
 if ! test -d build; then
     mkdir -p build
     (cd build && ${dn}/../../ci/build-rpm.sh)
+else
+    # XXX: we should invalidate based on `git describe` or something
+    echo "NOTE: Re-using prebuilt RPMs:"
+    find build -name '*.rpm'
 fi
 
 # https://fedoraproject.org/wiki/CI/Tests

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