usbmount: install configuration file unconditionally
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sun, 30 Nov 2014 14:18:58 +0000 (15:18 +0100)
committerPeter Korsgaard <peter@korsgaard.com>
Mon, 1 Dec 2014 23:38:24 +0000 (00:38 +0100)
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: fix indentation as noted by Yann]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/usbmount/usbmount.mk

index cc25e4b48b93cd05f9e601d797e4c6f2aa2630c0..9e893c8d8bbf4154d9f331eff81c0042f1e628a2 100644 (file)
@@ -20,9 +20,7 @@ define USBMOUNT_INSTALL_TARGET_CMDS
                $(TARGET_DIR)/etc/usbmount/usbmount.d/00_remove_model_symlink
 
        $(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules
-       @if [ ! -f $(TARGET_DIR)/etc/usbmount/usbmount.conf ]; then \
-               $(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf; \
-       fi
+       $(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf
 
        mkdir -p $(addprefix $(TARGET_DIR)/media/usb,0 1 2 3 4 5 6 7)
 endef