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>

diff --git a/.travis-functions.sh b/.travis-functions.sh
index ece05d409cc72ffb7b13ec211ddd280d21483773..7b20e886c24b9136f045a5e3c380d43d36d860be 100755 (executable)
--- 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 ac9819f808ec2f46039d9ab12ebcef27546a68dc..67a0c98ecbadb05153156c0a227f2c133ccbd86e 100644 (file)
--- 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 6fbc517d24819d54cabbb03a32fd367f63f8935b..754f1f44dc5ee0b48d9e580a99879cd8c1bd2464 100644 (file)
--- 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