[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2f3e47a042ced0b90c448840765c22d3fb1f44a6

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 2f3e47a042ced0b90c448840765c22d3fb1f44a6

[git]

[-- Attachment #1: Type: text/plain, Size: 2276 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  2f3e47a042ced0b90c448840765c22d3fb1f44a6 (commit)
      from  679ac9f163b1d4b3f321c0773510fba0bb9cad78 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2f3e47a042ced0b90c448840765c22d3fb1f44a6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Apr 9 17:56:47 2015 +0200

    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.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/89/filelists/files | 1 +
 config/rootfiles/core/89/update.sh       | 1 +
 2 files changed, 2 insertions(+)

Difference in files:
diff --git a/config/rootfiles/core/89/filelists/files b/config/rootfiles/core/89/filelists/files
index c35b885..2be73d7 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 9c6cce9..bc80709 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


hooks/post-receive
--
IPFire 2.x development tree