diff mbox

[1/1] ifplugd: only install default action if not provided in skeleton

Message ID 1396140820-1793-1-git-send-email-danomimanchego123@gmail.com
State Accepted
Headers show

Commit Message

Danomi Manchego March 30, 2014, 12:53 a.m. UTC 
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>

---

This is basically a parallel check-in to ec771579451c54c8590800ca1803cd6bfcc9a116,
which extended the same consideration to ifplugd.conf.
---
 package/ifplugd/ifplugd.mk |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni March 30, 2014, 9:32 a.m. UTC | #1 
Dear Danomi Manchego,

On Sat, 29 Mar 2014 20:53:40 -0400, Danomi Manchego wrote:
> Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>

Applied, thanks.

Thomas
diff mbox

Patch

diff --git a/package/ifplugd/ifplugd.mk b/package/ifplugd/ifplugd.mk
index 837e016..81b3884 100644
--- a/package/ifplugd/ifplugd.mk
+++ b/package/ifplugd/ifplugd.mk
@@ -21,12 +21,14 @@  ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 endif
 
 define IFPLUGD_INSTALL_FIXUP
-	@if [ ! -f $(TARGET_DIR)/etc/ifplugd/ifplugd.conf ]; then \
+	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
-	$(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.action \
-		$(TARGET_DIR)/etc/ifplugd/ifplugd.action
+	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 0755 $(@D)/conf/ifplugd.init \
 		$(TARGET_DIR)/etc/init.d/S45ifplugd
 	# don't use bash for init script