ifplugd: install configuration files unconditionally

As discussed, users should use a rootfs overlay or a post-build script
instead of a custom skeleton to override files installed by Buildroot,
so there is no point in having conditions when installing init scripts
or configuration files.

[Peter: use install -m as noted by Yann]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index 3d0736a95bdbce1476cc732c090417260c85ad7c..03ed8cdf33a2c1604ee0e7b422ee22856ceb18fb 100644 (file)
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -21,14 +21,10 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 endif
 
 define IFPLUGD_INSTALL_FIXUP
-       if [ ! -f $(TARGET_DIR)/etc/ifplugd/ifplugd.conf ]; then \
-               $(INSTALL) -D $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
-               $(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
-       fi
-       if [ ! -f $(TARGET_DIR)/etc/ifplugd/ifplugd.action ]; then \
-               $(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.action \
-                       $(TARGET_DIR)/etc/ifplugd/ifplugd.action ; \
-       fi
+       $(INSTALL) -D -m 0644 $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
+       $(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
+       $(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.action \
+               $(TARGET_DIR)/etc/ifplugd/ifplugd.action ; \
 endef
 
 IFPLUGD_POST_INSTALL_TARGET_HOOKS += IFPLUGD_INSTALL_FIXUP