From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 9 Apr 2015 15:56:47 +0000 (+0200)
Subject: setup: Has been moved to /usr/sbin
X-Git-Tag: v2.17-core89~3^2~8
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=2f3e47a042ced0b90c448840765c22d3fb1f44a6

setup: Has been moved to /usr/sbin

The setup program has been moved from /usr/local/sbin/setup
to /usr/sbin/setup to comply better with FHS. The old copy
was left in the file system on updated systems and was
preferred when called from the shell which is not intended.

The old file is now removed and to make sure every system
has got the new file it is shipped once again.
---

diff --git a/config/rootfiles/core/89/filelists/files b/config/rootfiles/core/89/filelists/files
index c35b885dad..2be73d7d87 100644
--- a/config/rootfiles/core/89/filelists/files
+++ b/config/rootfiles/core/89/filelists/files
@@ -13,6 +13,7 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/local/bin/collectdctrl
 usr/local/bin/openvpnctrl
+usr/sbin/setup
 var/ipfire/backup/bin/backup.pl
 var/ipfire/graphs.pl
 var/ipfire/langs
diff --git a/config/rootfiles/core/89/update.sh b/config/rootfiles/core/89/update.sh
index 9c6cce9785..bc80709489 100644
--- a/config/rootfiles/core/89/update.sh
+++ b/config/rootfiles/core/89/update.sh
@@ -35,6 +35,7 @@ done
 /etc/init.d/ipsec stop
 
 # Remove old files
+rm -f /usr/local/sbin/setup
 
 # Extract files
 extract_files