diff options
| -rwxr-xr-x | .travis-functions.sh | 1 | ||||
| -rw-r--r-- | login-utils/Makemodule.am | 4 | ||||
| -rw-r--r-- | sys-utils/Makemodule.am | 10 |
3 files changed, 12 insertions, 3 deletions
diff --git a/.travis-functions.sh b/.travis-functions.sh index ece05d409..7b20e886c 100755 --- a/.travis-functions.sh +++ b/.travis-functions.sh @@ -42,6 +42,7 @@ function check_nonroot xconfigure \ --disable-use-tty-group \ + --disable-makeinstall-chown \ --enable-all-programs \ || return $MAKE || return 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 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 |