summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-11-30 15:18:58 +0100
committerPeter Korsgaard <peter@korsgaard.com>2014-12-02 00:38:24 +0100
commite3d6179bb767c4a6d726cf897d47a076892357db (patch)
tree98e6ad384abf3197a3be6f057d4528d0c9257444
parent963bbf266bfebc240888cf8bce502a2fadb38c48 (diff)
downloadbuildroot-e3d6179bb767c4a6d726cf897d47a076892357db.tar.gz
buildroot-e3d6179bb767c4a6d726cf897d47a076892357db.zip
usbmount: install configuration file 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: fix indentation as noted by Yann] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/usbmount/usbmount.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/package/usbmount/usbmount.mk b/package/usbmount/usbmount.mk
index cc25e4b48b..9e893c8d8b 100644
--- a/package/usbmount/usbmount.mk
+++ b/package/usbmount/usbmount.mk
@@ -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
OpenPOWER on IntegriCloud