Merge remote-tracking branch 'origin/master' into next

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

diff --git a/lfs/stage2 b/lfs/stage2
index a084816309c4f69ae518c187e23e4280289cb117..53f81d1b46c7cfbe3beace327c31505e96c7c478 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -49,7 +49,7 @@ $(TARGET) :
        @$(PREBUILD)
 
        # Create directories
-       -mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib,mnt,opt,run}
+       -mkdir -pv /{bin,boot,etc/opt,etc/modprobe.d,home,lib/firmware/brcm,mnt,opt,run}
        -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var}
        -install -dv -m 0750 /root
        -install -dv -m 1777 /tmp /var/tmp
@@ -75,7 +75,8 @@ $(TARGET) :
 
        # Config files
        cp -rvf $(DIR_SRC)/config/etc/* /etc;
-       touch /etc/mtab
+       cp -rvf $(DIR_SRC)/config/lib/* /lib;
+       touch /etc/{fs,m}tab
        echo "$(NAME) v$(VERSION) - $(SLOGAN)" >  /etc/issue
        echo "===============================" >> /etc/issue
        echo "\n running on \s \r \m"          >> /etc/issue
@@ -100,7 +101,8 @@ $(TARGET) :
 
        # Move script to correct place.
        mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/
-
+       mv -vf /usr/local/bin/ovpn-collectd-convert /usr/sbin/
+       
        # Install firewall scripts.
        mkdir -pv /usr/lib/firewall
        install -m 755 $(DIR_SRC)/config/firewall/rules.pl \