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 c35b885dad776569a3ecdc4ce6033bffa872522d..2be73d7d87b8df22a6f63c51a9b21b916162b974 100644 (file)
--- 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
 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
 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 9c6cce97856418ad52e7030cebee45da3ae974fd..bc8070948934dcc4185c35f80f25b19d2e3afa7a 100644 (file)
--- 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
 /etc/init.d/ipsec stop
 
 # Remove old files

+rm -f /usr/local/sbin/setup

 
 # Extract files
 extract_files
 
 # Extract files
 extract_files