busybox: only install S01logging / S10mdev if not present in fs skeleton

To allow custom syslogd / mdev configutations.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 0751f6a2a547e6500acef51b7c06acfbbc2f95c6..c95190d2ad4855c157cffdb25f53f6b0f170298a 100644 (file)
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -31,7 +31,9 @@ endif
 # If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d
 ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
 define BUSYBOX_INSTALL_MDEV_SCRIPT
-       install -m 0755 package/busybox/S10mdev $(TARGET_DIR)/etc/init.d
+       [ -f $(TARGET_DIR)/etc/init.d/S10mdev ] ||
+               install -D -m 0755 package/busybox/S10mdev \
+                       $(TARGET_DIR)/etc/init.d/S10mdev
 endef
 define BUSYBOX_INSTALL_MDEV_CONF
        [ -f $(TARGET_DIR)/etc/mdev.conf ] || \
@@ -129,8 +131,9 @@ endif
 
 define BUSYBOX_INSTALL_LOGGING_SCRIPT
        if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \
-               $(INSTALL) -m 0755 -D package/busybox/S01logging \
-                       $(TARGET_DIR)/etc/init.d/S01logging; \
+               [ -f $(TARGET_DIR)/etc/init.d/S01logging ] || \
+                       $(INSTALL) -m 0755 -D package/busybox/S01logging \
+                               $(TARGET_DIR)/etc/init.d/S01logging; \
        else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi
 endef