--- elwix/config/rc.subr	2017/02/13 16:52:46	1.10
+++ elwix/config/rc.subr	2021/03/11 13:59:50	1.11
@@ -4,11 +4,16 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: rc.subr,v 1.10 2017/02/13 16:52:46 misho Exp $
+# $Id: rc.subr,v 1.11 2021/03/11 13:59:50 misho Exp $
 #
 
 ### Dont edit this file !!!
 
+Die() {
+	echo -n "EXIT: " >&2; echo "$@" >&2
+	exit 1
+}
+
 CheckVer()
 {
 	[ -z "$1" -o ! -r "$1" ] && return 1
@@ -51,15 +56,24 @@ MakeFS_var()
 	cd $1
 
 	install -d altroot;
+
+	install -d altroot/pkg;
+	install -d altroot/pkg/db;
+	install -d altroot/pkg/keys;
+	install -d altroot/pkg/keys/revoked;
+	install -d altroot/pkg/keys/trusted;
+
 	install -d altroot/var;
 	install -d altroot/var/account;
 	install -d altroot/var/at;
 	install -d altroot/var/at/jobs;
 	install -d altroot/var/at/spool;
 	install -d -g 63 -m 0770 altroot/var/authpf;
+	install -d altroot/var/backups;
 	install -d -m 0750 altroot/var/cron;
 	install -d -m 0700 altroot/var/cron/tabs;
 	install -d altroot/var/db;
+	install -d altroot/var/db/pkg;
 	install -d -m 0555 altroot/var/empty;
 	install -d altroot/var/log;
 	install -d -o 80 -g 80 -m 0700 altroot/var/log/lighttpd;
@@ -102,7 +116,8 @@ 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 -
 }
@@ -135,9 +150,6 @@ MakeFS_etc()
 
 	chmod 0440 $1/etc/sudoers;
 
-#	chgrp 80 $1/etc/config.xml;
-#	chmod 0660 $1/etc/config.xml;
-
 	mkdir -p $1/etc/mqtt;
 	chgrp -R 883 $1/etc/mqtt;
 	chown -R 883 $1/etc/mqtt;
@@ -147,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;
 
@@ -173,19 +185,6 @@ MakeFS_home()
 	install -v ${CFGDIR}/root.skel/vimrc $1/root/.vimrc;
 }
 
-# $1 = fs/elwix
-MakeFS_backup()
-{
-	mkdir -p $1/altroot/backup
-
-	cd $1
-#	cp -p etc/config.xml altroot/backup
-	tar -czf altroot/backup/.etc.tgz etc
-
-	cd altroot
-	tar -czf backup/.var.tgz var
-}
-
 # $1 = fs
 MakeFS_boot()
 {
@@ -198,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;
 			;;
 		*)
 			;;
@@ -207,6 +208,7 @@ MakeFS_boot()
 
 	if [ -r ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf ]; then
 		install -m 644 ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf $1/boot/loader.conf;
+		install -m 644 ${CFGDIR}/boot/loader.conf.local $1/boot/loader.conf.local;
 	fi;
 }
 
@@ -312,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
 }