Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

[people/mfischer/ipfire-2.x.git] / lfs / stage2

diff --git a/lfs/stage2 b/lfs/stage2
index 3876060ce2250766f65e7e550263bd32344a1e1c..9f93babe2f046e718d90fa12e765048935b2f1ee 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -39,7 +39,7 @@ check :
 
 download :
 
-md5 :
+b2 :
 
 ###############################################################################
 # Installation Details
@@ -113,10 +113,8 @@ endif
 
        # Move script to correct place.
        mv -vf /usr/local/bin/openvpn-metrics /usr/sbin/
-       mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/
-       mv -vf /usr/local/bin/ovpn-collectd-convert /usr/sbin/
        mv -vf /usr/local/bin/captive-cleanup /usr/bin/
-       
+
        # Install firewall scripts.
        mkdir -pv /usr/lib/firewall
        install -m 755 $(DIR_SRC)/config/firewall/rules.pl \
@@ -142,7 +140,7 @@ endif
 
        # Permissions
        chmod 0711 /var/empty
-       
+
        # A small hack to include /root to the iso but not all of it's files.
        touch /root/ipfire