summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2010-01-31 18:06:37 -0800
committerEric Sandall2010-02-06 17:58:12 -0800
commit772223f233abf0fc54cf6575fafb15ac437cbd7a (patch)
tree5cbcab84f0bbb621be8e08fccc5ebf603b9e7afb
parent5602a9df9bcedac56de3b1abc2381993d96b654e (diff)
ifupdown: Just remove /sbin/ifdown if it exists before we install
Fix Bug #14367 (cherry picked from commit 68f6a3f00c14fd6d16f16812d1382090d3b2ec8d)
-rw-r--r--net/ifupdown/HISTORY4
-rwxr-xr-xnet/ifupdown/INSTALL5
2 files changed, 6 insertions, 3 deletions
diff --git a/net/ifupdown/HISTORY b/net/ifupdown/HISTORY
index 8c7cee22d9..e2eb434b93 100644
--- a/net/ifupdown/HISTORY
+++ b/net/ifupdown/HISTORY
@@ -1,3 +1,7 @@
+2010-01-31 Eric Sandall <sandalle@sourcemage.org>
+ * INSTALL: Just remove /sbin/ifdown if it exists before we install
+ Fix Bug #14367
+
2009-10-19 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 0.6.9
diff --git a/net/ifupdown/INSTALL b/net/ifupdown/INSTALL
index 9e8f6b82fa..fda0e79740 100755
--- a/net/ifupdown/INSTALL
+++ b/net/ifupdown/INSTALL
@@ -1,6 +1,5 @@
-# the makefile doesn't ln -sf so it might fail. so we destroy an easily
-# creatable symlink for safety
-if [ -h $INSTALL_ROOT/sbin/ifdown ]; then
+# the makefile doesn't ln -sf so it might fail.
+if [ -f $INSTALL_ROOT/sbin/ifdown ]; then
rm -f $INSTALL_ROOT/sbin/ifdown
fi &&