Fixed issue where config file is always overwritten -> test.

4 files changed, 58 insertions, 2 deletions

diff --git a/net/ifplugd/HISTORY b/net/ifplugd/HISTORY
index fefbea1caf..bee5ba443f 100644
--- a/net/ifplugd/HISTORY
+++ b/net/ifplugd/HISTORY
@@ -1,3 +1,10 @@
+2006-06-13 Juuso Alasuutari <iuso@sourcemage.org>
+	* PRE_BUILD: Hacked $SOURCE_DIRECTORY/conf/Makefile.in to not 
+	  install ifplugd.conf, we'll do that ourselves to prevent it 
+	  from being overwritten. Also pruned existing code a little.
+	* conf/ifplugd.conf: Added.
+	* INSTALL: Added, install ifplugd.conf with install_config_file.
+
 2006-04-27 Juuso Alasuutari <iuso@sourcemage.org>
 	* DETAILS: Added a few keywords, updated PATCHLEVEL
 	* init.d/ifplugd: Fixed return value handling
diff --git a/net/ifplugd/INSTALL b/net/ifplugd/INSTALL
new file mode 100755
index 0000000000..c07cfee20f
--- /dev/null
+++ b/net/ifplugd/INSTALL
@@ -0,0 +1,5 @@
+default_install  &&
+
+# Install this separately, otherwise the existing one is overwritten
+install_config_file  $SCRIPT_DIRECTORY/conf/ifplugd.conf  \
+                               /etc/ifplugd/ifplugd.conf
diff --git a/net/ifplugd/PRE_BUILD b/net/ifplugd/PRE_BUILD
index cb40008f8d..3d08da0639 100755
--- a/net/ifplugd/PRE_BUILD
+++ b/net/ifplugd/PRE_BUILD
@@ -1,3 +1,5 @@
-default_pre_build &&
+default_pre_build  &&
 
-sedit 's/^[^I]*INSTALL[^i]*ifplugd\.init.*ifplugd$/# hack to prevent ifplugd.init install/' $SOURCE_DIRECTORY/conf/Makefile.in
+# Prevent install of init script and config file
+sedit 's/^.*INSTALL.*ifplugd\.init.*$//' $SOURCE_DIRECTORY/conf/Makefile.in  &&
+sedit 's/^.*INSTALL.*ifplugd\.conf.*$//' $SOURCE_DIRECTORY/conf/Makefile.in
diff --git a/net/ifplugd/conf/ifplugd.conf b/net/ifplugd/conf/ifplugd.conf
new file mode 100644
index 0000000000..1e0f83a4c0
--- /dev/null
+++ b/net/ifplugd/conf/ifplugd.conf
@@ -0,0 +1,42 @@
+# -*-sh-*-
+# $Id: ifplugd.conf 43 2003-09-13 11:25:11Z lennart $
+
+# This file is part of ifplugd.
+#
+# ifplugd is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# ifplugd is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with ifplugd; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+# ifplugd configuration file
+
+# Please note that this is a bourne shell fragment sourced by the
+# init script of ifplugd.
+
+# Specify the interfaces to control here, separated by spaces.
+# Ifplugd processes will be started for each of these interfaces when
+# the ifplugd init script is called with the "start" argument. You may
+# use the magic string "auto" to make the init script start or stop
+# ifplugd processes for ALL eth and wlan interfaces that are available
+# according to /proc/net/dev. Note that the list of interfaces
+# appearing in /proc/net/dev may depend on which kernel modules you
+# have loaded.
+INTERFACES="eth0"
+
+# Additional parameters for ifplugd.
+# (Run "ifplugd -h" for further information.)
+ARGS="-fwI -u0 -d10"
+
+# Additional parameters for ifplugd for the specified interface.  Note
+# that $ARGS is ignored, when a variable like this is set for an
+# interface
+#ARGS_wlan0="-MwI -u5 -d5"