issue/motd: add architecture warning also to console and ssh logins.

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

diff --git a/lfs/stage2 b/lfs/stage2
index d6012b85e5dadcb86e0cdd6b009a65a4a6efacc0..9032b013e74184b1b64cc5d7fd1be72a2cc5812a 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -53,7 +53,7 @@ $(TARGET) :
        -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var}
        -install -dv -m 0750 /root
        -install -dv -m 1777 /tmp /var/tmp
-       -mkdir -pv /usr/{,local/}{bin,include,lib{,/sse2},sbin,src}
+       -mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
        -mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
        -mkdir -v  /usr/{,local/}share/{misc,terminfo,xt_geoip,zoneinfo}
        -mkdir -pv /usr/{,local/}share/man/man{1..8}
@@ -69,6 +69,11 @@ ifeq "$(IS_64BIT)" "1"
        ln -svf lib /usr/lib64
 endif
 
+ifeq "$(BUILD_ARCH)" "riscv64"
+       ln -svf . /lib/lp64d
+       ln -svf . /usr/lib/lp64d
+endif
+
        # Symlinks
        # for this reason, stage2 rebuild will broke the iso:perl, grubbatch
        -ln -sv $(TOOLS_DIR)/bin/{bash,cat,echo,pwd,stty} /bin
@@ -80,11 +85,13 @@ endif
 
        # Config files
        cp -rvf $(DIR_SRC)/config/etc/* /etc;
+       [ ! -d "$(DIR_SRC)/config/etc-$(BUILD_ARCH)" ] || cp -rvf $(DIR_SRC)/config/etc-$(BUILD_ARCH)/* /etc
        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
+       -cat /etc/motd >> /etc/issue
 
        # Bash startup files
        install --directory --mode=0755 --owner=root --group=root /etc/profile.d
@@ -105,6 +112,7 @@ endif
        done
 
        # 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/