Merge remote-tracking branch 'stevee/axel-log-fix' into axel-fixperms

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

diff --git a/lfs/stage2 b/lfs/stage2
index 59cb947b44b31a7d8fa7835e03b5c546ca3b2a72..beb0abbcb2d4fb0a884080c1856c8c7f3b826092 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -63,15 +63,15 @@ $(TARGET) :
        
        # Symlinks
        # for this reason, stage2 rebuild will broke the iso:perl, grubbatch
-       -ln -sv /tools/bin/{bash,cat,grep,pwd,stty} /bin
+       -ln -sv /tools/bin/{bash,cat,echo,pwd,stty} /bin
        -ln -sv /tools/bin/perl /usr/bin
        -ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
+       -ln -sv /tools/lib/libstdc++.so{,.6} /usr/lib
+       sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
        -ln -sv bash /bin/sh
 
        # Config files
-       for i in $(DIR_SRC)/config/etc/*; do \
-           [ -f $$i ] && cp $$i /etc; \
-       done
+       cp -rvf $(DIR_SRC)/config/etc/* /etc;
        touch /etc/mtab
        echo "$(NAME) v$(VERSION) - $(SLOGAN)" >  /etc/issue
        echo "===============================" >> /etc/issue
@@ -83,7 +83,11 @@ $(TARGET) :
            [ -f $$i ] && cp $$i /etc/profile.d; \
        done
        chmod 755 /etc/bashrc
-       ln -svf ../bashrc /etc/profile.d/bashrc.sh
+
+       # Install root's bash files.
+       for i in $(DIR_SRC)/config/bash/dot_*; do \
+               [ -f $$i ] && cp $$i /root/$$(basename $${i/dot_/\.}); \
+       done
 
        # Scripts
        for i in `find $(DIR_SRC)/src/scripts -maxdepth 1 -type f`; do \
@@ -91,6 +95,9 @@ $(TARGET) :
            chmod 755 /usr/local/bin/`basename $$i`; \
        done
 
+       # Move script to correct place.
+       mv -vf /usr/local/bin/ovpn-ccd-convert /usr/sbin/
+
        # Nobody user
        -mkdir -p /home/nobody
        chown -R nobody:nobody /home/nobody
@@ -110,4 +117,8 @@ $(TARGET) :
        # A small hack to include /root to the iso but not all of it's files.
        touch /root/ipfire
 
+       # License agreement
+       -mkdir -pv /usr/share/doc/licenses/
+       cp -vf $(DIR_SRC)/doc/COPYING /usr/share/doc/licenses/GPLv3
+
        @$(POSTBUILD)