summaryrefslogtreecommitdiffstats
path: root/login-utils/Makemodule.am
diff options
context:
space:
mode:
authorKarel Zak2017-06-21 11:12:04 +0200
committerKarel Zak2017-06-21 11:12:04 +0200
commita65041b5ae9de5dc52d37a43367d64ab554964c0 (patch)
tree23c6738af32aabbd211558d6c9ec8b9392181eec /login-utils/Makemodule.am
parentwipefs: exit on failed erase (diff)
downloadkernel-qcow2-util-linux-a65041b5ae9de5dc52d37a43367d64ab554964c0.tar.gz
kernel-qcow2-util-linux-a65041b5ae9de5dc52d37a43367d64ab554964c0.tar.xz
kernel-qcow2-util-linux-a65041b5ae9de5dc52d37a43367d64ab554964c0.zip
build-sys: make chown usage more robust
* add --disable-makeinstall-chown to travis non-root mode * use "if MAKEINSTALL_DO_SETUID" for chown root:root Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'login-utils/Makemodule.am')
-rw-r--r--login-utils/Makemodule.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/login-utils/Makemodule.am b/login-utils/Makemodule.am
index ac9819f80..67a0c98ec 100644
--- a/login-utils/Makemodule.am
+++ b/login-utils/Makemodule.am
@@ -229,8 +229,10 @@ test_logindefs_CPPFLAGS = -DTEST_PROGRAM $(AM_CPPFLAGS)
install-exec-hook:
if BUILD_SU
-if MAKEINSTALL_DO_SETUID
+if MAKEINSTALL_DO_CHOWN
chown root:root $(DESTDIR)$(bindir)/su
+endif
+if MAKEINSTALL_DO_SETUID
chmod 4755 $(DESTDIR)$(bindir)/su
endif
endif