diff --git a/system_files/dx/usr/lib/systemd/system/incus-workaround.service b/system_files/dx/usr/lib/systemd/system/incus-workaround.service index 7866300..2b4ba31 100644 --- a/system_files/dx/usr/lib/systemd/system/incus-workaround.service +++ b/system_files/dx/usr/lib/systemd/system/incus-workaround.service @@ -1,5 +1,5 @@ [Unit] -Description=Workaround swtpm not having the correct label +Description=Workaround incus not having the correct label ConditionFileIsExecutable=/usr/bin/incus ConditionFileIsExecutable=/usr/bin/incus-agent ConditionPathExists=/usr/lib/incus diff --git a/system_files/dx/usr/lib/systemd/system/swtpm-workaround.service b/system_files/dx/usr/lib/systemd/system/swtpm-workaround.service deleted file mode 100644 index b4cd40d..0000000 --- a/system_files/dx/usr/lib/systemd/system/swtpm-workaround.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=Workaround swtpm not having the correct label -ConditionFileIsExecutable=/usr/bin/swtpm -After=local-fs.target - -[Service] -Type=oneshot -# Copy if it doesn't exist -ExecStartPre=/usr/bin/bash -c "[ -x /usr/local/bin/overrides/swtpm ] || /usr/bin/cp /usr/bin/swtpm /usr/local/bin/overrides/swtpm" -# This is faster than using .mount unit. Also allows for the previous line/cleanup -ExecStartPre=/usr/bin/mount --bind /usr/local/bin/overrides/swtpm /usr/bin/swtpm -# Fix SELinux label -ExecStart=/usr/sbin/restorecon /usr/bin/swtpm -# Clean-up after ourselves -ExecStop=/usr/bin/umount /usr/bin/swtpm -ExecStop=/usr/bin/rm /usr/local/bin/overrides/swtpm -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/system_files/dx/usr/lib/tmpfiles.d/swtpm-workaround.conf b/system_files/dx/usr/lib/tmpfiles.d/swtpm-workaround.conf deleted file mode 100644 index 62147f4..0000000 --- a/system_files/dx/usr/lib/tmpfiles.d/swtpm-workaround.conf +++ /dev/null @@ -1,2 +0,0 @@ -C /usr/local/bin/overrides/swtpm - - - - /usr/bin/swtpm -d /var/lib/swtpm-localca 0750 tss tss - -