--- elwix/config/rc.subr 2017/06/21 14:11:29 1.10.2.7 +++ elwix/config/rc.subr 2020/10/22 12:37:59 1.10.2.12 @@ -4,11 +4,16 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: rc.subr,v 1.10.2.7 2017/06/21 14:11:29 misho Exp $ +# $Id: rc.subr,v 1.10.2.12 2020/10/22 12:37:59 misho Exp $ # ### Dont edit this file !!! +Die() { + echo -n "EXIT: " >&2; echo "$@" >&2 + exit 1 +} + CheckVer() { [ -z "$1" -o ! -r "$1" ] && return 1 @@ -111,7 +116,7 @@ MakeFS_var() touch altroot/var/log/ppp.log chgrp 69 altroot/var/log/ppp.log - install -v $2/resolv.safe altroot/var/run/resolv.conf +# install -v $2/resolv.safe altroot/var/run/resolv.conf install -v ${WORLD}/usr/share/keys/pkg/trusted/* altroot/pkg/keys/trusted cd - @@ -154,11 +159,11 @@ MakeFS_etc() ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime; ln -sf /usr/share/misc/termcap $1/etc/termcap; - ln -sf /var/run/resolv.conf $1/etc/resolv.conf; +# ln -sf /var/run/resolv.conf $1/etc/resolv.conf; # ln -sf /elwix/pkg/etc/mk.conf $1/etc/mk.conf; - echo ${TARGET_ARCH} >$1/etc/platform; + echo "${TARGET_ARCH} $3" >$1/etc/platform; Create_etc_motd $1/etc/motd $3; @@ -192,6 +197,8 @@ MakeFS_boot() install -m 444 ${CFGDIR}/boot/logo-elwix.4th $1/boot; install -m 444 ${CFGDIR}/boot/brand-elwix.4th $1/boot; install -m 444 ${CFGDIR}/boot/menu.4th $1/boot; + install -m 444 ${CFGDIR}/boot/logo-elwix.lua $1/boot/lua; + install -m 444 ${CFGDIR}/boot/brand-elwix.lua $1/boot/lua; ;; *) ;; @@ -307,5 +314,18 @@ StripFiles() done cd - rm -f $TMPFILE + fi +} + +# $1 = file_pattern +# $2 = From dir +# $3 = To dir +InstallLinks() +{ + if [ -d "$2" ]; then + cd $2 + find . -type l -name "$1" | + tar -cvf - -T - | tar -C $3 -xf - + cd - fi }