From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 15 May 2024 12:00:51 +0000 (+0200)
Subject: TEST-24-CRYPTSETUP: Store tokens in /usr
X-Git-Tag: v256-rc3~58^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7d16bc81bfb7feeefa0a6a18cf0e3e2a72f7aa4;p=thirdparty%2Fsystemd.git

TEST-24-CRYPTSETUP: Store tokens in /usr

We want to be able to boot with empty /var.
---

diff --git a/test/TEST-24-CRYPTSETUP/test.sh b/test/TEST-24-CRYPTSETUP/test.sh
index 93b447f583d..a7e118c4f0d 100755
--- a/test/TEST-24-CRYPTSETUP/test.sh
+++ b/test/TEST-24-CRYPTSETUP/test.sh
@@ -80,9 +80,9 @@ setup_pkcs11_token() {
     local P11_MODULE_CONFIGS_DIR P11_MODULE_DIR SOFTHSM_MODULE
 
     export SOFTHSM2_CONF="/tmp/softhsm2.conf"
-    mkdir -p "$initdir/var/lib/softhsm/tokens/"
+    mkdir -p "$initdir/usr/lib/softhsm/tokens/"
     cat >${SOFTHSM2_CONF} <<EOF
-directories.tokendir = $initdir/var/lib/softhsm/tokens/
+directories.tokendir = $initdir/usr/lib/softhsm/tokens/
 objectstore.backend = file
 slots.removable = false
 slots.mechanisms = ALL
@@ -139,7 +139,7 @@ EOF
     inst_simple "$P11_MODULE_CONFIGS_DIR/softhsm2.module"
 
     cat >"$initdir/etc/softhsm2.conf" <<EOF
-directories.tokendir = /var/lib/softhsm/tokens/
+directories.tokendir = /usr/lib/softhsm/tokens/
 objectstore.backend = file
 slots.removable = false
 slots.mechanisms = ALL