sendEmail: New addon

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

diff --git a/lfs/stage2 b/lfs/stage2
index 8a8c8fd0ca71b69601609bb036e2c33d37195dc0..5059923aeb8f16af0ccf2408da39739ab426b98f 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -69,9 +69,7 @@ $(TARGET) :
        -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
@@ -82,6 +80,8 @@ $(TARGET) :
        for i in $(DIR_SRC)/config/profile.d/*; do \
            [ -f $$i ] && cp $$i /etc/profile.d; \
        done
+       chmod 755 /etc/bashrc
+       ln -svf ../bashrc /etc/profile.d/bashrc.sh
 
        # Scripts
        for i in `find $(DIR_SRC)/src/scripts -maxdepth 1 -type f`; do \
@@ -89,6 +89,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
@@ -108,4 +111,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)