diff --git a/.gitignore b/.gitignore index 012ef88..2df22bb 100644 --- a/.gitignore +++ b/.gitignore @@ -79,5 +79,4 @@ tests/test_config /debian/swtpm-dev /debian/swtpm-libs /debian/swtpm-tools -/debian/swtpm-tools.postinst /debian/tmp diff --git a/configure.ac b/configure.ac index 4eab9f4..5b69591 100644 --- a/configure.ac +++ b/configure.ac @@ -483,7 +483,6 @@ AC_SUBST([MY_CFLAGS]) AC_SUBST([MY_LDFLAGS]) AC_CONFIG_FILES([Makefile \ - debian/swtpm-tools.postinst \ swtpm.spec \ samples/Makefile \ samples/swtpm-localca.conf \ diff --git a/debian/control b/debian/control index adc9efa..68ebffc 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Standards-Version: 4.5.1 Rules-Requires-Root: no Build-Depends: debhelper (>= 10), dh-apparmor, + dh-sequence-installsysusers, expect, gawk, gnutls-bin, diff --git a/debian/swtpm-tools.install b/debian/swtpm-tools.install index 81d038d..2e739db 100755 --- a/debian/swtpm-tools.install +++ b/debian/swtpm-tools.install @@ -7,6 +7,8 @@ cat <<_EOF_ /usr/bin/swtpm_ioctl /usr/bin/swtpm_localca /usr/bin/swtpm_setup +/usr/lib/tmpfiles.d/swtpm-tmpfiles.conf +/usr/lib/sysusers.d/swtpm-sysusers.conf /usr/share/man/man8/swtpm-create-tpmca.8* /usr/share/man/man8/swtpm-localca.8* /usr/share/man/man5/swtpm-localca.conf.5* diff --git a/debian/swtpm-tools.postinst.in b/debian/swtpm-tools.postinst.in deleted file mode 100644 index e4c04f0..0000000 --- a/debian/swtpm-tools.postinst.in +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -set -e - -SWTPM_LOCALCA_DIR=@LOCALSTATEDIR@/lib/swtpm-localca - -case "$1" in - configure) - # creating @TSS_USER@ group if he isn't already there - if ! getent group @TSS_USER@ >/dev/null; then - addgroup --system @TSS_USER@ - fi - - # creating @TSS_USER@ user if he isn't already there - if ! getent passwd @TSS_USER@ >/dev/null; then - adduser --system --ingroup @TSS_USER@ --shell /bin/false \ - --home /var/lib/tpm --no-create-home \ - --gecos "TPM software stack" \ - @TSS_USER@ - fi - - if ! [ -d $SWTPM_LOCALCA_DIR ]; then - mkdir -p $SWTPM_LOCALCA_DIR - chown @TSS_USER@:root $SWTPM_LOCALCA_DIR - chmod 0750 $SWTPM_LOCALCA_DIR - fi - - ;; - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac