Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: jacmet at uclibc.org <jacmet@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/ifplugd
Date: Wed,  2 Jul 2008 00:20:17 -0700 (PDT)	[thread overview]
Message-ID: <20080702072017.7DBCC3C6FA@busybox.net> (raw)

Author: jacmet
Date: 2008-07-02 00:20:16 -0700 (Wed, 02 Jul 2008)
New Revision: 22606

Log:
ifplugd: only install default config if not provided in skeleton

Modified:
   trunk/buildroot/package/ifplugd/ifplugd.mk


Changeset:
Modified: trunk/buildroot/package/ifplugd/ifplugd.mk
===================================================================
--- trunk/buildroot/package/ifplugd/ifplugd.mk	2008-07-02 00:17:21 UTC (rev 22605)
+++ trunk/buildroot/package/ifplugd/ifplugd.mk	2008-07-02 07:20:16 UTC (rev 22606)
@@ -18,12 +18,13 @@
 
 $(IFPLUGD_HOOK_POST_INSTALL):
 	$(INSTALL) -d $(TARGET_DIR)/etc/ifplugd
-	$(INSTALL) $(IFPLUGD_DIR)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/
+	@if [ ! -f $(TARGET_DIR)/etc/ifplugd/ifplugd.conf ]; then \
+		$(INSTALL) $(IFPLUGD_DIR)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/; \
+		$(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \
+	fi
 	$(INSTALL) -m 0755 $(IFPLUGD_DIR)/conf/ifplugd.action \
 		$(TARGET_DIR)/etc/ifplugd/
 	$(INSTALL) -m 0755 $(IFPLUGD_DIR)/conf/ifplugd.init \
 		$(TARGET_DIR)/etc/init.d/S45ifplugd
-	# continue booting without waiting for fork (no -w option)
-	$(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf
 	# don't use bash for init script
 	$(SED) 's^/bin/bash^/bin/sh^g' $(TARGET_DIR)/etc/init.d/S45ifplugd

             reply	other threads:[~2008-07-02  7:20 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-02  7:20 jacmet at uclibc.org [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-07-10  8:17 [Buildroot] svn commit: trunk/buildroot/package/ifplugd jacmet at uclibc.org
2008-08-19  9:40 jacmet at uclibc.org
2008-12-04 12:14 jacmet at uclibc.org
2008-12-13 19:40 jacmet at uclibc.org

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080702072017.7DBCC3C6FA@busybox.net \
    --to=jacmet@uclibc.org \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox