Skip to content

Commit

Permalink
swtpm_setup: Leave swtpm_setup.sh ownership to root
Browse files Browse the repository at this point in the history 
swtpm_setup.sh does not need to be owned by tss:tss and in the
Fedora package it's not even allowed. So remove the install hook
that was changing the ownership.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
  • Loading branch information
@stefanberger
stefanberger committed Nov 6, 2018
1 parent 588c063 commit 05d8160
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dist/swtpm.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ fi
%{_bindir}/swtpm_cert
%endif
%{_bindir}/swtpm_setup
%attr( 755, tss , tss) %{_bindir}/swtpm_setup.sh
%{_bindir}/swtpm_setup.sh
%{_bindir}/swtpm_ioctl
%{_mandir}/man8/swtpm_bios.8*
%{_mandir}/man8/swtpm_cert.8*
Expand Down
2 changes: 1 addition & 1 deletion dist/swtpm.spec.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ fi
%{_bindir}/swtpm_cert
%endif
%{_bindir}/swtpm_setup
%attr( 755, @TSS_USER@ , @TSS_GROUP@) %{_bindir}/swtpm_setup.sh
%{_bindir}/swtpm_setup.sh
%{_bindir}/swtpm_ioctl
%{_mandir}/man8/swtpm_bios.8*
%{_mandir}/man8/swtpm_cert.8*
Expand Down
5 changes: 0 additions & 5 deletions src/swtpm_setup/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ swtpm_setup_SOURCES = swtpm_setup.c

dist_bin_SCRIPTS = swtpm_setup.sh

install-exec-hook:
if test -z $(DESTDIR); then \
chown @TSS_USER@:@TSS_GROUP@ $(DESTDIR)$(bindir)/swtpm_setup.sh || true; \
fi

EXTRA_DIST = \
README

Expand Down

0 comments on commit 05d8160

Please sign in to comment.