Skip to contentSkip to conversation

ifplugd: only install default action if not provided in skeleton

PATCH New Danomi Manchego 2 participants 2 messages Mar 30, 2014

lore
Share & tools
lore

Danomi Manchego

author
#0 lore raw

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

Signed-off-by Danomi Manchego <[email protected]>

---

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(-)
package/ifplugd/ifplugd.mk +5 -3
index 837e016..81b3884 100644
@@ -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
Signature · 1 line
1.7.9.5
Applied
#1 lore raw

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

Dear Danomi Manchego,

Quoted 1 line · Danomi Manchego
Signed-off-by Danomi Manchego <[email protected]>

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com