summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-11-23 22:28:30 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-11-23 22:28:30 (GMT)
commit1fccc2031412d1025deda5f44c8b0a42c045f929 (patch)
treea0fe10f1b10ec084c65fb54e42f00ae7f75e7803
parent7a63f1a08c4e7d9df4bf3d0eed48b4d5447e6c26 (diff)
downloadbuildroot-1fccc2031412d1025deda5f44c8b0a42c045f929.tar.gz
buildroot-1fccc2031412d1025deda5f44c8b0a42c045f929.tar.bz2
rsyslog: only install S01rsyslog if not present in fs skeleton
To allow custom configurations. Reported-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/rsyslog/rsyslog.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk
index 6582812..b7576cd 100644
--- a/package/rsyslog/rsyslog.mk
+++ b/package/rsyslog/rsyslog.mk
@@ -13,8 +13,9 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
endif
define RSYSLOG_INSTALL_CONF_SCRIPT
- $(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \
- $(TARGET_DIR)/etc/init.d/S01rsyslog
+ [ -f $(TARGET_DIR)/etc/init.d/S01rsyslog ] || \
+ $(INSTALL) -m 0755 -D package/rsyslog/S01rsyslog \
+ $(TARGET_DIR)/etc/init.d/S01rsyslog
[ -f $(TARGET_DIR)/etc/rsyslog.conf ] || \
$(INSTALL) -m 0644 -D $(@D)/rsyslog.conf \
$(TARGET_DIR)/etc/rsyslog.conf