From 87dcc801a25f6f37748ce9462c6c9ffed3046d80 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 12 Feb 2024 11:50:50 -0500
Subject: [PATCH] ostree-tmpfiles.conf: Drop `var` entry

We are backing away from this semantic, and moving towards
`/var` only being initialized at initial provisioning.
---
 src/boot/ostree-tmpfiles.conf              |  4 ---
 tests/kolainst/destructive/var-tmpfiles.sh | 29 ----------------------
 2 files changed, 33 deletions(-)
 delete mode 100755 tests/kolainst/destructive/var-tmpfiles.sh

diff --git a/src/boot/ostree-tmpfiles.conf b/src/boot/ostree-tmpfiles.conf
index c1b50480..69c2d3f3 100644
--- a/src/boot/ostree-tmpfiles.conf
+++ b/src/boot/ostree-tmpfiles.conf
@@ -17,7 +17,3 @@
 d /run/ostree 0755 root root -
 # https://github.com/ostreedev/ostree/issues/393
 R! /var/tmp/ostree-unlock-ovl.*
-# Automatically propagate all /var content from /usr/share/factory/var;
-# NOTE: This is now considered a mistake, and will likely be reverted.
-# As of OSTree 2024.3, content from the initial deployment is used.
-C+! /var - - - - -
diff --git a/tests/kolainst/destructive/var-tmpfiles.sh b/tests/kolainst/destructive/var-tmpfiles.sh
deleted file mode 100755
index 3ce9e359..00000000
--- a/tests/kolainst/destructive/var-tmpfiles.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-set -xeuo pipefail
-
-. ${KOLA_EXT_DATA}/libinsttest.sh
-
-require_writable_sysroot
-prepare_tmpdir
-
-case "${AUTOPKGTEST_REBOOT_MARK:-}" in
-  "")
-    factory_var=rootfs/usr/share/factory/var
-    mkdir -p ${factory_var}
-    cd "${factory_var}"
-    mkdir -p home/someuser
-    echo bashrc > home/someuser/.bashrc
-    chown -R 1000:1000 home/someuser
-    mkdir -m 01777 -p tmp
-    cd -
-    ostree commit -b testlint --no-bindings --selinux-policy-from-base --tree=ref="${host_refspec}" --consume --tree=dir=rootfs
-    ostree admin deploy testlint 2>err.txt
-    assert_not_file_has_content err.txt 'contains content in /var'
-
-    /tmp/autopkgtest-reboot "2"
-    ;;
-  2)
-    assert_file_has_content /home/someuser/.bashrc bashrc
-    ;;
-  *) fatal "Unexpected AUTOPKGTEST_REBOOT_MARK=${AUTOPKGTEST_REBOOT_MARK}" ;;
-esac
-- 
2.30.2