diff options
| author | Karel Zak | 2017-06-21 11:12:04 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-06-21 11:12:04 +0200 |
| commit | a65041b5ae9de5dc52d37a43367d64ab554964c0 (patch) | |
| tree | 23c6738af32aabbd211558d6c9ec8b9392181eec /sys-utils/Makemodule.am | |
| parent | wipefs: exit on failed erase (diff) | |
| download | kernel-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 'sys-utils/Makemodule.am')
| -rw-r--r-- | sys-utils/Makemodule.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index 6fbc517d2..754f1f44d 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -289,15 +289,21 @@ umount_static_LDFLAGS = $(umount_LDFLAGS) -all-static umount_static_LDADD = $(umount_LDADD) endif -if MAKEINSTALL_DO_SETUID install-exec-hook-mount: +if MAKEINSTALL_DO_CHOWN chown root:root $(DESTDIR)$(bindir)/mount +endif +if MAKEINSTALL_DO_SETUID chmod 4755 $(DESTDIR)$(bindir)/mount +endif +if MAKEINSTALL_DO_CHOWN chown root:root $(DESTDIR)$(bindir)/umount +endif +if MAKEINSTALL_DO_SETUID chmod 4755 $(DESTDIR)$(bindir)/umount +endif INSTALL_EXEC_HOOKS += install-exec-hook-mount -endif endif # BUILD_MOUNT |